diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2016-09-07 14:30:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-07 14:30:08 +0200 |
| commit | 1d04c9e307892c275f9fad64ef0ebe9bc10e0260 (patch) | |
| tree | 89a88e9a3a6df6dc4ea1fa62e3c340aac3d5a230 /lib/private | |
| parent | c8ec237cbe4dca8c5e8dbc0f21256c230f0135ca (diff) | |
| parent | 43ff2f05fd2cb4b0e2bed60da8e7b0ac764571e1 (diff) | |
| download | nextcloud-server-1d04c9e307892c275f9fad64ef0ebe9bc10e0260.tar.gz nextcloud-server-1d04c9e307892c275f9fad64ef0ebe9bc10e0260.zip | |
Merge pull request #1287 from nextcloud/correctly-remove-admin-stuff
Correctly remove admin sections and settings
Diffstat (limited to 'lib/private')
| -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; |