aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrxu <rxu@mail.ru>2011-06-06 00:50:53 +0800
committerrxu <rxu@mail.ru>2011-06-06 00:53:54 +0800
commitd44b6ba5caeafe220b4959a6de99d035fe10b4f1 (patch)
tree242ea683cc7ab60318152a19eaa9145c912eb66c
parent6585d938d2c441900d8af6d25da2433d3beec856 (diff)
downloadforums-d44b6ba5caeafe220b4959a6de99d035fe10b4f1.tar
forums-d44b6ba5caeafe220b4959a6de99d035fe10b4f1.tar.gz
forums-d44b6ba5caeafe220b4959a6de99d035fe10b4f1.tar.bz2
forums-d44b6ba5caeafe220b4959a6de99d035fe10b4f1.tar.xz
forums-d44b6ba5caeafe220b4959a6de99d035fe10b4f1.zip
[ticket/217] Use positive parameter statement for bbcode_init()
PHPBB3-217
-rw-r--r--phpBB/includes/message_parser.php4
-rw-r--r--tests/bbcode/url_bbcode_test.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index a6a4e530f0..9e0e61d0ba 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -102,7 +102,7 @@ class bbcode_firstpass extends bbcode
/**
* Init bbcode data for later parsing
*/
- function bbcode_init($no_custom_bbcode = false)
+ function bbcode_init($allow_custom_bbcode = true)
{
static $rowset;
@@ -135,7 +135,7 @@ class bbcode_firstpass extends bbcode
$this->parsed_items[$tag] = 0;
}
- if ($no_custom_bbcode)
+ if (!$allow_custom_bbcode)
{
return;
}
diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php
index 6d9e51664d..597933c6f8 100644
--- a/tests/bbcode/url_bbcode_test.php
+++ b/tests/bbcode/url_bbcode_test.php
@@ -32,7 +32,7 @@ class phpbb_url_bbcode_test extends phpbb_test_case
{
$bbcode = new bbcode_firstpass();
$bbcode->message = $message;
- $bbcode->bbcode_init(true);
+ $bbcode->bbcode_init(false);
$bbcode->parse_bbcode();
$this->assertNotEquals($bbcode->message, '[url][/url]');
$this->assertNotEquals($bbcode->message, $message);