From 8aebf6191f0942b6e0fbdc5b07f8069a68d3ee70 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 14 Feb 2018 13:18:47 +0100
Subject: [locations] One permission for direct subnet editing; restructure
 handling a bit

---
 modules-available/locations/inc/location.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules-available/locations/inc/location.inc.php')

diff --git a/modules-available/locations/inc/location.inc.php b/modules-available/locations/inc/location.inc.php
index 0576e660..d43c36a7 100644
--- a/modules-available/locations/inc/location.inc.php
+++ b/modules-available/locations/inc/location.inc.php
@@ -251,7 +251,7 @@ class Location
 	{
 		$ids = array();
 		foreach ($tree as $node) {
-			$ids[] = $node['locationid'];
+			$ids[] = (int)$node['locationid'];
 			if (!empty($node['children'])) {
 				$ids = array_merge($ids, self::extractIds($node['children']));
 			}
-- 
cgit v1.2.3-55-g7522


From 4c8a7363bf24072bebfa5e80b0257dd6011a8db0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 2 Jan 2019 14:26:34 +0100
Subject: [locations] Fix invalid array access

---
 modules-available/locations/inc/location.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules-available/locations/inc/location.inc.php')

diff --git a/modules-available/locations/inc/location.inc.php b/modules-available/locations/inc/location.inc.php
index d43c36a7..8db0c5f3 100644
--- a/modules-available/locations/inc/location.inc.php
+++ b/modules-available/locations/inc/location.inc.php
@@ -429,7 +429,7 @@ class Location
 			foreach ($self as $entry) {
 				if (!isset($locs[$entry]))
 					continue;
-				$overlapSelf[]['locationname'] = $locs[$entry['locationid']]['locationname'];
+				$overlapSelf[]['locationname'] = $locs[$entry]['locationname'];
 			}
 		}
 		if ($overlapOther) {
-- 
cgit v1.2.3-55-g7522