diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-08 10:59:36 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-08 10:59:36 +0000 |
commit | 4306d4d083d50e9ef7ed01260aa95ea4ac453dee (patch) | |
tree | bd3b63b6a2c30c131790f6b7dd28edddb04589c1 /phpBB/includes/message_parser.php | |
parent | 0e7adebad6e61c066b52e5480d5aa36a23571388 (diff) | |
download | forums-4306d4d083d50e9ef7ed01260aa95ea4ac453dee.tar forums-4306d4d083d50e9ef7ed01260aa95ea4ac453dee.tar.gz forums-4306d4d083d50e9ef7ed01260aa95ea4ac453dee.tar.bz2 forums-4306d4d083d50e9ef7ed01260aa95ea4ac453dee.tar.xz forums-4306d4d083d50e9ef7ed01260aa95ea4ac453dee.zip |
- fix some smaller bugs
- removed custom profiles preview field from acp
git-svn-id: file:///svn/phpbb/trunk@6022 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r-- | phpBB/includes/message_parser.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 9f85549d8d..e16f930cce 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -767,8 +767,8 @@ class parse_message extends bbcode_firstpass // Do some general 'cleanup' first before processing message, // e.g. remove excessive newlines(?), smilies(?) // Transform \r\n and \r into \n - $match = array('#\r\n?#', '#sid=[a-z0-9]*?&?#', "#([\n][\s]+){3,}#", '#(script|about|applet|activex|chrome):#i'); - $replace = array("\n", '', "\n\n", "\\1:"); + $match = array('#\r\n?#', "#([\n][\s]+){3,}#", '#(script|about|applet|activex|chrome):#i'); + $replace = array("\n", "\n\n", "\\1:"); $this->message = preg_replace($match, $replace, trim($this->message)); // Message length check. -1 disables this check completely. |