fix search page personality issues
Merge remote-tracking branch 'origin/master' into 1.4.5

Conflicts:
	themes/garland/search.php

	modified:   themes/effervescence_plus/search.php
	modified:   themes/garland/search.php
Fix merge error