Moved some code around to make PHP 5.3 happy
Fixed PHP 5.3 compat
Text with ignore tags is considered rich
Merge branch 'master' into phpBB-compare