merge r8956, r8957 and r8960
commitef2267bd5aa92dd1c733bd2c4c8caefb1d418f78
authoracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Tue, 30 Sep 2008 15:18:35 +0000 (30 15:18 +0000)
committeracydburn <acydburn@89ea8834-ac86-4346-8a33-228a782c2dd0>
Tue, 30 Sep 2008 15:18:35 +0000 (30 15:18 +0000)
tree4a24c7861d50bc475f27220b3eb317bf09e836dd
parentd0b57ace2493ee516c3190bdda8f914b9b13dba1
merge r8956, r8957 and r8960

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