From 43ff2f05fd2cb4b0e2bed60da8e7b0ac764571e1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 6 Sep 2016 14:37:09 +0200 Subject: [PATCH] Correctly remove admin sections and settings --- lib/private/Settings/Manager.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index df2f52f816..e7be3d4e77 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;