aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCallum Macrae <callum@lynxphp.com>2012-03-11 19:20:13 +0000
committerCallum Macrae <callum@lynxphp.com>2012-03-17 18:06:45 +0000
commit784c9725f3394ce866ab260485b32d501e07a628 (patch)
treee5e8d806646912d9b739d2982cf960fa65490ac7
parent4f59990d900b699cdd2cfe4b43e6972bf99d977b (diff)
downloadforums-784c9725f3394ce866ab260485b32d501e07a628.tar
forums-784c9725f3394ce866ab260485b32d501e07a628.tar.gz
forums-784c9725f3394ce866ab260485b32d501e07a628.tar.bz2
forums-784c9725f3394ce866ab260485b32d501e07a628.tar.xz
forums-784c9725f3394ce866ab260485b32d501e07a628.zip
[ticket/10510] Made a couple improvements to phpbb_add_quickmod_option.
PHPBB3-10510
-rw-r--r--phpBB/includes/functions_content.php2
-rw-r--r--phpBB/viewtopic.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index b9ab2d8a7a..872d071b91 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -1264,7 +1264,7 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
* @param string $option The value of the option.
* @param string $lang_string The language string to use.
*/
-function phpbb_add_quickmod_option($option, $lang_string, $condition = true)
+function phpbb_add_quickmod_option($option, $lang_string)
{
global $template;
$template->assign_block_vars('quickmod', array(
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 717e1515a8..46c25cba81 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -535,8 +535,8 @@ $quickmod_array = array(
foreach($quickmod_array as $option => $qm_ary)
{
- $lang_string = $user->lang[$qm_ary[0]];
- if ((isset($qm_ary[1])) ? $qm_ary[1] : true)
+ $lang_string = $user->lang($qm_ary[0]);
+ if (isset($qm_ary[1]) && $qm_ary[1])
{
phpbb_add_quickmod_option($option, $lang_string);
}