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

Merge pull request #7455 from nextcloud/12_7230 

[stable12] Remove wrong entry in admin_settings that causes 500
This commit is contained in:
Morris Jobke 2017-12-11 22:45:25 +01:00 committed by GitHub
parent 2bd2835526 d41971184b
commit 77b58aeb16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -24,6 +24,7 @@
namespace OC\Settings; namespace OC\Settings;
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;
@ -352,6 +353,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']);
} }
} }