aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-03-27 21:32:08 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-03-27 21:32:08 +0000
commit056aa160f988cd10b6ee98625553dcc42e7eb27a (patch)
tree69e39770697f8084ba017fd9624dc770aec5cd97
parent253c2fadcd95dec5b8aa5d9d5600b6ed9c70752f (diff)
downloadforums-056aa160f988cd10b6ee98625553dcc42e7eb27a.tar
forums-056aa160f988cd10b6ee98625553dcc42e7eb27a.tar.gz
forums-056aa160f988cd10b6ee98625553dcc42e7eb27a.tar.bz2
forums-056aa160f988cd10b6ee98625553dcc42e7eb27a.tar.xz
forums-056aa160f988cd10b6ee98625553dcc42e7eb27a.zip
#1327
git-svn-id: file:///svn/phpbb/trunk@5737 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/bbcode.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index a030151ac3..37952d31a7 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -287,12 +287,11 @@ class bbcode
else
{
// Default template
-
$bbcode_tpl = (!empty($rowset[$bbcode_id]['second_pass_replace'])) ? $rowset[$bbcode_id]['second_pass_replace'] : $rowset[$bbcode_id]['bbcode_tpl'];
}
// 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-Z_]+)}/e', "(!empty(\$user->lang['\$1'])) ? \$user->lang['\$1'] : ucwords(strtolower(str_replace('_', ' ', '\$1')))", $bbcode_tpl);
if (!empty($rowset[$bbcode_id]['second_pass_replace']))
{