makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13832] Resolve minor coding issues

Browse source 
PHPBB3-13832
This commit is contained in:
Marc Alexander 2015-05-20 08:59:19 +02:00
parent 358c634153
commit 91cace06a5
2 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/bbcode.php
View file

@ -403,14 +403,7 @@ class bbcode
// Replace {L_*} lang strings
$bbcode_tpl = preg_replace_callback('/{L_([A-Z0-9_]+)}/', function ($match) use ($user) {
if (!empty($user->lang[$match['1']]))
{
return $user->lang[$match['1']];
}
else
{
return ucwords(strtolower(str_replace('_', ' ', $match['1'])));
}
return (!empty($user->lang[$match[1]])) ? $user->lang($match[1]) : ucwords(strtolower(str_replace('_', ' ', $match[1])));
}, $bbcode_tpl);
if (!empty($rowset[$bbcode_id]['second_pass_replace']))
@ -536,14 +529,7 @@ class bbcode
);
$tpl = preg_replace_callback('/{L_([A-Z0-9_]+)}/', function ($match) use ($user) {
if (!empty($user->lang[$match['1']]))
{
return $user->lang[$match['1']];
}
else
{
return ucwords(strtolower(str_replace('_', ' ', $match['1'])));
}
return (!empty($user->lang[$match[1]])) ? $user->lang($match[1]) : ucwords(strtolower(str_replace('_', ' ', $match[1])));
}, $tpl);
if (!empty($replacements[$tpl_name]))

2
phpBB/includes/ucp/ucp_pm_options.php
View file

@ -509,7 +509,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
// Build all three language arrays
preg_replace_callback('#^((RULE|ACTION|CHECK)_([A-Z0-9_]+))$#', function ($match) use(&$rule_lang, &$action_lang, &$check_lang, $user) {
${strtolower($match[2]) . '_lang'}[constant($match[1])] = $user->lang['PM_' . $match[2]][$match[3]];
} , array_keys(get_defined_constants()));
}, array_keys(get_defined_constants()));
/*
Rule Ordering: