diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-09-06 14:37:09 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2016-09-06 14:37:09 +0200 |
| commit | 43ff2f05fd2cb4b0e2bed60da8e7b0ac764571e1 (patch) | |
| tree | c9625e56b96ba5d5c6a3def02b45a7c89f76c8e2 /lib/private/Settings | |
| parent | 6a6af86a1ca14e8b803d7cd8653733842e21d25f (diff) | |
| download | nextcloud-server-43ff2f05fd2cb4b0e2bed60da8e7b0ac764571e1.tar.gz nextcloud-server-43ff2f05fd2cb4b0e2bed60da8e7b0ac764571e1.zip | |
Correctly remove admin sections and settings
Diffstat (limited to 'lib/private/Settings')
| -rw-r--r-- | lib/private/Settings/Manager.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index df2f52f816d..e7be3d4e77d 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -105,10 +105,10 @@ class Manager implements IManager { $appInfo = \OC_App::getAppInfo($appId); // hello static legacy if(isset($appInfo['settings'][IManager::KEY_ADMIN_SECTION])) { - $this->remove(self::TABLE_ADMIN_SECTIONS, $appInfo['settings'][IManager::KEY_ADMIN_SECTION]); + $this->remove(self::TABLE_ADMIN_SECTIONS, trim($appInfo['settings'][IManager::KEY_ADMIN_SECTION], '\\')); } if(isset($appInfo['settings'][IManager::KEY_ADMIN_SETTINGS])) { - $this->remove(self::TABLE_ADMIN_SETTINGS, $appInfo['settings'][IManager::KEY_ADMIN_SETTINGS]); + $this->remove(self::TABLE_ADMIN_SETTINGS, trim($appInfo['settings'][IManager::KEY_ADMIN_SETTINGS], '\\')); } } @@ -302,7 +302,7 @@ class Manager implements IManager { if(!$settings instanceof ISettings) { $this->log->error( - 'Admin section instance must implement \OCP\ISection. Invalid class: {class}', + 'Admin section instance must implement \OCP\Settings\ISection. Invalid class: {class}', ['class' => $settingsClassName] ); return; |