diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 6e1843315b..793d0d54bc 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -169,7 +169,14 @@ function get_forum_parents($forum_data) // Obtain list of moderators of each forum function get_moderators(&$forum_moderators, $forum_id = false) { - global $cache, $SID, $db, $acl_options, $phpEx; + global $config, $template, $db; + + // Have we disabled the display of moderators? If so, then return + // from whence we came ... after setting an S_ template var + if (empty($config['load_moderators'])) + { + return; + } if (!empty($forum_id) && is_array($forum_id)) { diff --git a/phpBB/posting.php b/phpBB/posting.php index 28a70170ba..227dfc143d 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -818,7 +818,7 @@ $template->assign_vars(array( 'FORUM_NAME' => $forum_name, 'FORUM_DESC' => (!empty($forum_desc)) ? strip_tags($forum_desc) : '', 'TOPIC_TITLE' => $topic_title, - 'MODERATORS' => (sizeof($moderators)) ? implode(', ', $moderators[$forum_id]) : $user->lang['NONE'], + 'MODERATORS' => (sizeof($moderators)) ? implode(', ', $moderators[$forum_id]) : '', 'USERNAME' => (((!$preview) && ($mode != 'quote')) || ($preview)) ? stripslashes($username) : '', 'SUBJECT' => $post_subject, 'PREVIEW_SUBJECT' => ($preview) ? $preview_subject : '', diff --git a/phpBB/templates/subSilver/posting_body.html b/phpBB/templates/subSilver/posting_body.html index 5e6f05d654..673a117d96 100644 --- a/phpBB/templates/subSilver/posting_body.html +++ b/phpBB/templates/subSilver/posting_body.html @@ -40,7 +40,7 @@ function checkForm()