diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-12-29 15:11:23 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-12-29 15:11:23 +0100 |
| commit | 71a1c9fee7aaf3f92e934302abd121d75d4c5df2 (patch) | |
| tree | e17dcc9b8477c68182e166f52db970f49f7c201a /phpBB | |
| parent | 94808e2cbc880aa16212aa24c7dd7e94bf511305 (diff) | |
| parent | dcab0762210a4059cca7458344dcc1aeb0360c42 (diff) | |
| download | forums-71a1c9fee7aaf3f92e934302abd121d75d4c5df2.tar forums-71a1c9fee7aaf3f92e934302abd121d75d4c5df2.tar.gz forums-71a1c9fee7aaf3f92e934302abd121d75d4c5df2.tar.bz2 forums-71a1c9fee7aaf3f92e934302abd121d75d4c5df2.tar.xz forums-71a1c9fee7aaf3f92e934302abd121d75d4c5df2.zip | |
Merge pull request #5796 from rxu/ticket/16276
[ticket/16276] Fix bbcode_firstpass undefined mode property
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_module.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 510d98ec11..e90c11f884 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -445,7 +445,7 @@ class p_master break; default: - if (!preg_match('#(?:' . implode(array_keys($valid_tokens), ')|(?:') . ')#', $token)) + if (!preg_match('#(?:' . implode(')|(?:', array_keys($valid_tokens)) . ')#', $token)) { $token = ''; } 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 |