summaryrefslogtreecommitdiffstats
path: root/modules-available
diff options
context:
space:
mode:
authorSimon Rettberg2017-05-09 17:32:39 +0200
committerSimon Rettberg2017-05-09 17:32:39 +0200
commit157e5ca93b032c8a3e5714d1b5eeafeef5f92e6d (patch)
tree6aaeb170d84d651fc7ac06514aa5692b89e815c1 /modules-available
parent[rebootcontrol] Fix current session display, colors for on/off (diff)
parent[locationinfo] Fix undefined variable 'openingtimes' (diff)
downloadslx-admin-157e5ca93b032c8a3e5714d1b5eeafeef5f92e6d.tar.gz
slx-admin-157e5ca93b032c8a3e5714d1b5eeafeef5f92e6d.tar.xz
slx-admin-157e5ca93b032c8a3e5714d1b5eeafeef5f92e6d.zip
Merge branch 'master' of dnbd3:openslx-ng/slx-admin
Diffstat (limited to 'modules-available')
-rw-r--r--modules-available/locationinfo/page.inc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index d43380c7..610ef0d0 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -496,7 +496,7 @@ class Page_LocationInfo extends Page
if ($row !== false) {
$openingtimes = json_decode($row['openingtime'], true);
}
- if (!is_array($openingtimes)) {
+ if (!isset($openingtimes) || !is_array($openingtimes)) {
$openingtimes = array();
}
if ($this->isEasyMode($openingtimes)) {