aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2013-12-02 00:53:42 -0800
committerCesar G <prototech91@gmail.com>2013-12-02 00:53:42 -0800
commiteef1b586d5b89acda9e18b2d7b2c051e10d18ef8 (patch)
treecc2e05e38b4e4638b07cf03bdc9640cebca40d1d
parentafb4585dd904de6f5ce4be2607cc90d0cb9def09 (diff)
downloadforums-eef1b586d5b89acda9e18b2d7b2c051e10d18ef8.tar
forums-eef1b586d5b89acda9e18b2d7b2c051e10d18ef8.tar.gz
forums-eef1b586d5b89acda9e18b2d7b2c051e10d18ef8.tar.bz2
forums-eef1b586d5b89acda9e18b2d7b2c051e10d18ef8.tar.xz
forums-eef1b586d5b89acda9e18b2d7b2c051e10d18ef8.zip
[ticket/12048] Fix the regexp for language keys in custom bbcodes.
PHPBB3-12048
-rw-r--r--phpBB/includes/bbcode.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 9356e3e9b4..f587e111f3 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -376,7 +376,7 @@ class bbcode
}
// Replace {L_*} lang strings
- $bbcode_tpl = preg_replace('/{L_([A-Z_]+)}/e', "(!empty(\$user->lang['\$1'])) ? \$user->lang['\$1'] : ucwords(strtolower(str_replace('_', ' ', '\$1')))", $bbcode_tpl);
+ $bbcode_tpl = preg_replace('/{L_([A-Z0-9_]+)}/e', "(!empty(\$user->lang['\$1'])) ? \$user->lang['\$1'] : ucwords(strtolower(str_replace('_', ' ', '\$1')))", $bbcode_tpl);
if (!empty($rowset[$bbcode_id]['second_pass_replace']))
{
@@ -480,7 +480,7 @@ class bbcode
'email' => array('{EMAIL}' => '$1', '{DESCRIPTION}' => '$2')
);
- $tpl = preg_replace('/{L_([A-Z_]+)}/e', "(!empty(\$user->lang['\$1'])) ? \$user->lang['\$1'] : ucwords(strtolower(str_replace('_', ' ', '\$1')))", $tpl);
+ $tpl = preg_replace('/{L_([A-Z0-9_]+)}/e', "(!empty(\$user->lang['\$1'])) ? \$user->lang['\$1'] : ucwords(strtolower(str_replace('_', ' ', '\$1')))", $tpl);
if (!empty($replacements[$tpl_name]))
{