mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 09:16:55 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2019-12-29 15:11:29 +01:00
parent bfaeabe9e5 71a1c9fee7
commit 9ea5cfd14b
17 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/functions_module.php
View File

@@ -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 = '';
}

3
phpBB/includes/message_parser.php
View File

@@ -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