aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrxu <rxu@mail.ru>2019-12-29 01:51:15 +0700
committerrxu <rxu@mail.ru>2019-12-29 01:51:15 +0700
commit82e61f501abfa2768d7faac1ccd8d688c84e5e13 (patch)
treee8537759677ca988b21a5412e8c706839106e490
parent72747ed6862282d1d38414ccf9c1ee56d63821a6 (diff)
downloadforums-82e61f501abfa2768d7faac1ccd8d688c84e5e13.tar
forums-82e61f501abfa2768d7faac1ccd8d688c84e5e13.tar.gz
forums-82e61f501abfa2768d7faac1ccd8d688c84e5e13.tar.bz2
forums-82e61f501abfa2768d7faac1ccd8d688c84e5e13.tar.xz
forums-82e61f501abfa2768d7faac1ccd8d688c84e5e13.zip
[ticket/16276] Fix bbcode_firstpass undefined mode property
PHPBB3-16276
-rw-r--r--phpBB/includes/message_parser.php3
-rw-r--r--tests/bbcode/parser_test.php1
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index e1c28223dc..d6214c4614 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -46,6 +46,7 @@ class bbcode_firstpass extends bbcode
var $message = '';
var $warn_msg = array();
var $parsed_items = array();
+ var $mode;
/**
* Parse BBCode
@@ -1128,8 +1129,6 @@ class parse_message extends bbcode_firstpass
var $allow_quote_bbcode = true;
var $allow_url_bbcode = true;
- var $mode;
-
/**
* The plupload object used for dealing with attachments
* @var \phpbb\plupload\plupload
diff --git a/tests/bbcode/parser_test.php b/tests/bbcode/parser_test.php
index b569d371f1..6e1fad9ad1 100644
--- a/tests/bbcode/parser_test.php
+++ b/tests/bbcode/parser_test.php
@@ -255,6 +255,7 @@ class phpbb_bbcode_parser_test extends \phpbb_test_case
$symfony_request = new \phpbb\symfony_request($request);
$bbcode = new bbcode_firstpass();
+ $bbcode->mode = 'post';
$bbcode->message = $message;
$bbcode->bbcode_init(false);
$bbcode->parse_bbcode();