merge fix for bug #27355
commitbdc553be7dae106cb974033da8e9b3dc2588d7a3
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Sun, 18 May 2008 18:58:42 +0000 (18 18:58 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Sun, 18 May 2008 18:58:42 +0000 (18 18:58 +0000)
treef3b2c96735f46712043a1699eaa90d45ceaf2e89
parent3eb5e5096ceb20022ff82a900ee3ad101d049498
merge fix for bug #27355

git-svn-id: http://code.phpbb.com/svn/phpbb/trunk@8562 89ea8834-ac86-4346-8a33-228a782c2dd0
phpBB/includes/functions_content.php