summaryrefslogtreecommitdiffstats
path: root/modules-available/locationinfo/api.inc.php
diff options
context:
space:
mode:
authorJannik Schönartz2017-03-07 00:24:13 +0100
committerJannik Schönartz2017-03-07 00:24:13 +0100
commitdbe397e5d003623c0e67ac1b59079656601c80f6 (patch)
treeadb42ce4342e1e2f8dfca2a77a4519c35991acc0 /modules-available/locationinfo/api.inc.php
parentMerge branch 'location-info-panel' of git.openslx.org:openslx-ng/slx-admin in... (diff)
downloadslx-admin-dbe397e5d003623c0e67ac1b59079656601c80f6.tar.gz
slx-admin-dbe397e5d003623c0e67ac1b59079656601c80f6.tar.xz
slx-admin-dbe397e5d003623c0e67ac1b59079656601c80f6.zip
API: Fixed Calendar json decode was missing on the calendar part.
Diffstat (limited to 'modules-available/locationinfo/api.inc.php')
-rw-r--r--modules-available/locationinfo/api.inc.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php
index ab940663..ff3c7269 100644
--- a/modules-available/locationinfo/api.inc.php
+++ b/modules-available/locationinfo/api.inc.php
@@ -94,10 +94,9 @@ function getCalendar($idList) {
$formattedArray = array();
foreach ($calendarFromBackend as $key => $value) {
$y['id'] = $key;
- $y['calendar'] = $value;
+ $y['calendar'] = json_decode($value, true);
$formattedArray[] = $y;
}
-
$resultarray = array_merge($resultarray, $formattedArray);
}