Changing back the preg_replace_callback change as it gave warnings in some places.
Now I suppressed the original warning.
Authored by: harm10 2015-04-19
Parent: [r4441]
Child: [r4443]
