summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-01-13 10:29:21 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-01-13 10:29:21 +0100
commite22186d234dbe359b8fc9035b509a62112ffbc9d (patch)
treedd9799bd4443de75675100b431db8c4b43038ac5 /lib
parentc5a200c4198de951dabdd3f783ade655b8ea6434 (diff)
parent4b3bef4dc78a52bb86550c54394482f18ff84500 (diff)
downloadnextcloud-server-e22186d234dbe359b8fc9035b509a62112ffbc9d.tar.gz
nextcloud-server-e22186d234dbe359b8fc9035b509a62112ffbc9d.zip
Merge pull request #21673 from owncloud/chrsch-master
-- Fixed error where $enabled is parsed but empty
Diffstat (limited to 'lib')
-rw-r--r--lib/private/app/appmanager.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php
index b060b2e6e1c..7cb945784bc 100644
--- a/lib/private/app/appmanager.php
+++ b/lib/private/app/appmanager.php
@@ -148,6 +148,10 @@ class AppManager implements IAppManager {
} elseif (is_null($user)) {
return false;
} else {
+ if(empty($enabled)){
+ return false;
+ }
+
$groupIds = json_decode($enabled);
if (!is_array($groupIds)) {