2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 91cd9cd05c..053449c528 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -1872,6 +1872,9 @@ function cache_moderators()
 {
 	global $db, $cache, $auth, $phpbb_root_path, $phpEx;
 
+	// Remove cached sql results
+	$cache->destroy('sql', MODERATOR_TABLE);
+
 	// Clear table
 	$db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . MODERATOR_TABLE);
 
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index aa91e4d761..b0d1b03809 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -147,6 +147,11 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		//
 		if ($row['parent_id'] == $root_data['forum_id'] || $row['parent_id'] == $branch_root_id)
 		{
+			if ($row['forum_type'] != FORUM_CAT)
+			{
+				$forum_ids_moderator[] = $forum_id;
+			}
+
 			// Direct child of current branch
 			$parent_id = $forum_id;
 			$forum_rows[$forum_id] = $row;
@@ -185,8 +190,6 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 				$forum_rows[$parent_id]['forum_id_last_post'] = $forum_id;
 			}
 		}
-
-		$forum_ids_moderator[$parent_id] = $forum_rows[$parent_id]['forum_id_last_post'];
 	}
 	$db->sql_freeresult($result);