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()
- + diff --git a/phpBB/templates/subSilver/viewforum_body.html b/phpBB/templates/subSilver/viewforum_body.html index 8e5aa18014..cd949f814e 100644 --- a/phpBB/templates/subSilver/viewforum_body.html +++ b/phpBB/templates/subSilver/viewforum_body.html @@ -2,7 +2,7 @@
{FORUM_NAME} :: {TOPIC_TITLE}
{L_MODERATORS}: {MODERATORS}

{LOGGED_IN_USER_LIST}
{FORUM_NAME} :: {TOPIC_TITLE}
{L_MODERATORS}: {MODERATORS}

{LOGGED_IN_USER_LIST}
- + diff --git a/phpBB/templates/subSilver/viewtopic_body.html b/phpBB/templates/subSilver/viewtopic_body.html index 848a45f6de..3f284da1f8 100644 --- a/phpBB/templates/subSilver/viewtopic_body.html +++ b/phpBB/templates/subSilver/viewtopic_body.html @@ -2,7 +2,7 @@
{FORUM_NAME}
{L_MODERATORS}: {MODERATORS}
{FORUM_NAME}
{L_MODERATORS}: {MODERATORS}
{MOD_CP}
- + diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index d729a4b0f4..693dc57cb9 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -210,7 +210,7 @@ if ($forum_data['forum_postable']) 'PAGE_NUMBER' => on_page($topics_count, $config['topics_per_page'], $start), 'TOTAL_TOPICS' => ($topics_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $topics_count), 'MOD_CP' => ($auth->acl_gets('m_', $forum_id)) ? sprintf($user->lang['MCP'], '', '') : '', - 'MODERATORS' => (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : $user->lang['NONE'], + 'MODERATORS' => (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : '', 'POST_IMG' => (intval($forum_data['forum_status']) == ITEM_LOCKED) ? $user->img('btn_locked', $post_alt) : $user->img('btn_post', $post_alt), 'FOLDER_IMG' => $user->img('folder', 'NO_NEW_POSTS'), diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index e31b3c9b08..e0b500ea21 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -368,7 +368,7 @@ $template->assign_vars(array( 'PAGE_NUMBER' => (isset($_GET['view']) && $_GET['view'] == 'print') ? '' : on_page($total_posts, $config['posts_per_page'], $start), 'TOTAL_POSTS' => ($total_posts == 1) ? $user->lang['VIEW_TOPIC_POST'] : sprintf($user->lang['VIEW_TOPIC_POSTS'], $total_posts), 'MCP' => ($auth->acl_get('m_', $forum_id)) ? sprintf($user->lang['MCP'], "session_id . "&t=$topic_id&start=$start&st=$sort_days&sk=$sort_key&sd=$sort_dir&posts_per_page=" . $config['posts_per_page'] . '">', '') : '', - 'MODERATORS' => (sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : $user->lang['NONE'], + 'MODERATORS' => (sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : '', 'POST_IMG' => $post_img, 'REPLY_IMG' => $reply_img,
{TOPIC_TITLE}
{L_MODERATORS}: {MODERATORS}
{TOPIC_TITLE}
{L_MODERATORS}: {MODERATORS}
{MCP}