Reapplied "Merge pull request #319 from jwacalex/gh_317_unable_to_edit_hidden_room_in_admin"

1 files changed, 12 insertions, 2 deletions

diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index 0b7d6b37..f160441c 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -197,7 +197,8 @@ function make_room_navigation($menu)
         return $menu;
     }
 
-    $rooms = Rooms();
+    // Get a list of all rooms
+    $rooms = Rooms(true);
     $room_menu = [];
     if (in_array('admin_rooms', $privileges)) {
         $room_menu[] = toolbar_item_link(page_link_to('admin_rooms'), 'list', _('Manage rooms'));
@@ -206,7 +207,16 @@ function make_room_navigation($menu)
         $room_menu[] = toolbar_item_divider();
     }
     foreach ($rooms as $room) {
-        $room_menu[] = toolbar_item_link(room_link($room), 'map-marker', $room['Name']);
+        if (
+            $room['show'] == 'Y' // room is public
+            || (
+                // room is not public, but user can admin_rooms
+                $room['show'] != 'Y'
+                && in_array('admin_rooms', $privileges)
+            )
+        ) {
+            $room_menu[] = toolbar_item_link(room_link($room), 'map-marker', $room['Name']);
+        }
     }
     if (count($room_menu) > 0) {
         $menu[] = toolbar_dropdown('map-marker', _('Rooms'), $room_menu);