Fixed #32489 : Database prefix did not work if first in string or not first in quotes, make usable on php 5.3/5.4 (closeure without $this)
Fixed #32489 : Database prefix did not work if first in string or not first in quotes, small code cleanup