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

Remove wrong entry in admin_settings that causes 500 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-11-20 17:23:20 +01:00
parent f347e2e4a6
commit 6fd51426bf
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ namespace OC\Settings;
use OC\Accounts\AccountManager; use OC\Accounts\AccountManager;
use OCP\App\IAppManager; use OCP\App\IAppManager;
use OCP\AppFramework\QueryException; use OCP\AppFramework\QueryException;
use OCP\AutoloadNotAllowedException;
use OCP\Encryption\IManager as EncryptionManager; use OCP\Encryption\IManager as EncryptionManager;
use OCP\IConfig; use OCP\IConfig;
use OCP\IDBConnection; use OCP\IDBConnection;
@ -471,6 +472,10 @@ class Manager implements IManager {
$settings[$row['priority']][] = $this->query($row['class']); $settings[$row['priority']][] = $this->query($row['class']);
} catch (QueryException $e) { } catch (QueryException $e) {
// skip // skip
} catch (AutoloadNotAllowedException $e) {
// skip error and remove remnant of disabled app
$this->log->warning('Orphan setting entry will be removed from admin_settings: ' . json_encode($row));
$this->mapper->remove(Mapper::TABLE_ADMIN_SETTINGS, $row['class']);
} }
} }