diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-02 10:07:49 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-02 10:07:49 +0100 |
| commit | d4da154cdaad049c2d085925ea48fc91539b69fd (patch) | |
| tree | b008411d4251738537737a12e060825a3d0e245e /phpBB/includes/bbcode.php | |
| parent | d867bda6af7a3d2163babc5ac21d3723cb96536e (diff) | |
| parent | be338864efd8878e6ec6ca32545b991be3656f6a (diff) | |
| download | forums-d4da154cdaad049c2d085925ea48fc91539b69fd.tar forums-d4da154cdaad049c2d085925ea48fc91539b69fd.tar.gz forums-d4da154cdaad049c2d085925ea48fc91539b69fd.tar.bz2 forums-d4da154cdaad049c2d085925ea48fc91539b69fd.tar.xz forums-d4da154cdaad049c2d085925ea48fc91539b69fd.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12048] Fix the regexp for language keys in custom bbcodes.
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index c4076a0120..683fbf0fd2 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -362,7 +362,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'])) { @@ -466,7 +466,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])) { |