aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-06-05 13:23:55 -0400
committerrxu <rxu@mail.ru>2011-06-06 21:14:10 +0800
commit2d1e426ba745fa5b0b7666e5fe4a5fee97caccd7 (patch)
treed848e98b7d5cfd7a71b7af0584336b4fb5c52460 /phpBB/includes
parentd44b6ba5caeafe220b4959a6de99d035fe10b4f1 (diff)
downloadforums-2d1e426ba745fa5b0b7666e5fe4a5fee97caccd7.tar
forums-2d1e426ba745fa5b0b7666e5fe4a5fee97caccd7.tar.gz
forums-2d1e426ba745fa5b0b7666e5fe4a5fee97caccd7.tar.bz2
forums-2d1e426ba745fa5b0b7666e5fe4a5fee97caccd7.tar.xz
forums-2d1e426ba745fa5b0b7666e5fe4a5fee97caccd7.zip
[ticket/217] Silence errors in tests, not code.
Use a mock user object for testing bbcode. PHPBB3-217
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/message_parser.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 9e0e61d0ba..a134fab5d3 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -975,7 +975,7 @@ class bbcode_firstpass extends bbcode
}
// Is this a link to somewhere inside this board? If so then remove the session id from the url
- if (strpos($url, @generate_board_url()) !== false && strpos($url, 'sid=') !== false)
+ if (strpos($url, generate_board_url()) !== false && strpos($url, 'sid=') !== false)
{
$url = preg_replace('/(&amp;|\?)sid=[0-9a-f]{32}&amp;/', '\1', $url);
$url = preg_replace('/(&amp;|\?)sid=[0-9a-f]{32}$/', '', $url);