aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_module.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-12-29 15:11:23 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-12-29 15:11:23 +0100
commit71a1c9fee7aaf3f92e934302abd121d75d4c5df2 (patch)
treee17dcc9b8477c68182e166f52db970f49f7c201a /phpBB/includes/functions_module.php
parent94808e2cbc880aa16212aa24c7dd7e94bf511305 (diff)
parentdcab0762210a4059cca7458344dcc1aeb0360c42 (diff)
downloadforums-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/includes/functions_module.php')
-rw-r--r--phpBB/includes/functions_module.php2
1 files changed, 1 insertions, 1 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 = '';
}