diff options
author | Simon Rettberg | 2019-01-02 14:26:59 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-01-02 14:26:59 +0100 |
commit | 5c474545cb943ed2643028547d0b688355616554 (patch) | |
tree | 9c35f82b2b0d212a09bc270d93af613290262323 /modules-available/locations/inc | |
parent | Merge branch 'master' into ipxe (diff) | |
parent | [locations] Fix invalid array access (diff) | |
download | slx-admin-5c474545cb943ed2643028547d0b688355616554.tar.gz slx-admin-5c474545cb943ed2643028547d0b688355616554.tar.xz slx-admin-5c474545cb943ed2643028547d0b688355616554.zip |
Merge branch 'master' into ipxe
Diffstat (limited to 'modules-available/locations/inc')
-rw-r--r-- | modules-available/locations/inc/location.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |