aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/functions_content.php5
-rw-r--r--phpBB/viewtopic.php3
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index 872d071b91..f2faf20f43 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -1261,12 +1261,13 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
/**
* Add an option to the quick-mod tools.
*
- * @param string $option The value of the option.
+ * @param string $option The language key for the value of the option.
* @param string $lang_string The language string to use.
*/
function phpbb_add_quickmod_option($option, $lang_string)
{
- global $template;
+ global $template, $user;
+ $lang_string = $user->lang($lang_string);
$template->assign_block_vars('quickmod', array(
'VALUE' => $option,
'TITLE' => $lang_string,
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 1c03aae39e..cf97196e31 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -535,10 +535,9 @@ $quickmod_array = array(
foreach($quickmod_array as $option => $qm_ary)
{
- $lang_string = $user->lang($qm_ary[0]);
if (!empty($qm_ary[1]))
{
- phpbb_add_quickmod_option($option, $lang_string);
+ phpbb_add_quickmod_option($option, $qm_ary[0]);
}
}