bug #4361 Can't change font size (when config.inc.php not present)

Signed-off-by: Marc Delisle <marc@infomarc.info>
Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>