summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2018-02-22 10:56:56 +0100
committerSimon Rettberg2018-02-22 10:56:56 +0100
commit302f7b1b0f3e46049324f4e3890eb37a193c917b (patch)
treec647e17116cee03e8da8fdc461ca08075204d5c7
parent[permissionmanager] Ensure uniqueness in role_x_location table, consistent ta... (diff)
downloadslx-admin-302f7b1b0f3e46049324f4e3890eb37a193c917b.tar.gz
slx-admin-302f7b1b0f3e46049324f4e3890eb37a193c917b.tar.xz
slx-admin-302f7b1b0f3e46049324f4e3890eb37a193c917b.zip
[locations] Fix location list: Filter invalid location ids
-rw-r--r--modules-available/locations/page.inc.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules-available/locations/page.inc.php b/modules-available/locations/page.inc.php
index ed541876..c4328b1b 100644
--- a/modules-available/locations/page.inc.php
+++ b/modules-available/locations/page.inc.php
@@ -341,6 +341,8 @@ class Page_Locations extends Page
// we have permission to, so the tree doesn't look all weird
$visibleLocationIds = $allowedLocationIds = User::getAllowedLocations("location.view");
foreach ($allowedLocationIds as $lid) {
+ if (!isset($locationList[$lid]))
+ continue;
$visibleLocationIds = array_merge($visibleLocationIds, $locationList[$lid]['parents']);
}
$visibleLocationIds = array_unique($visibleLocationIds);