diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-03 12:20:33 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-03 12:20:33 +0200 |
| commit | 122141be92febc6c47cec2be71b2b72c54c9f72c (patch) | |
| tree | 40c840fe2a308be0d98cadcff72934ebd612d80a | |
| parent | 99d7352ef9ed42af6f7d76c4d2e983705c2b43f6 (diff) | |
| parent | 8f4611e21d334ea3135bbdbf9519236bb4b6b173 (diff) | |
| download | nextcloud-server-122141be92febc6c47cec2be71b2b72c54c9f72c.tar.gz nextcloud-server-122141be92febc6c47cec2be71b2b72c54c9f72c.zip | |
Merge pull request #19543 from owncloud/fix-19542
Check if decoded JSON returned null
| -rw-r--r-- | settings/admin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/admin.php b/settings/admin.php index ec49b3e823f..aa891314fab 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -88,7 +88,7 @@ $excludeGroups = $appConfig->getValue('core', 'shareapi_exclude_groups', 'no') = $template->assign('shareExcludeGroups', $excludeGroups); $excludedGroupsList = $appConfig->getValue('core', 'shareapi_exclude_groups_list', ''); $excludedGroupsList = json_decode($excludedGroupsList); -$template->assign('shareExcludedGroupsList', implode('|', $excludedGroupsList)); +$template->assign('shareExcludedGroupsList', !is_null($excludedGroupsList) ? implode('|', $excludedGroupsList) : ''); $template->assign('encryptionEnabled', \OC::$server->getEncryptionManager()->isEnabled()); $backends = \OC::$server->getUserManager()->getBackends(); $externalBackends = (count($backends) > 1) ? true : false; |