mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correctly remove admin sections and settings

This commit is contained in:
Joas Schilling 2016-09-06 14:37:09 +02:00
parent 6a6af86a1c
commit 43ff2f05fd
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Settings/Manager.php
View File

@ -105,10 +105,10 @@ class Manager implements IManager {
$appInfo = \OC_App::getAppInfo($appId); // hello static legacy $appInfo = \OC_App::getAppInfo($appId); // hello static legacy
if(isset($appInfo['settings'][IManager::KEY_ADMIN_SECTION])) { 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])) { 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) { if(!$settings instanceof ISettings) {
$this->log->error( $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] ['class' => $settingsClassName]
); );
return; return;