From d41971184b3884d7c82faa5ca65429a358a3cb9f Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 20 Nov 2017 17:23:20 +0100 Subject: [PATCH] Remove wrong entry in admin_settings that causes 500 Signed-off-by: Morris Jobke --- lib/private/Settings/Manager.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index d40dfd1e41..323ea4f4bd 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -24,6 +24,7 @@ namespace OC\Settings; use OCP\AppFramework\QueryException; +use OCP\AutoloadNotAllowedException; use OCP\Encryption\IManager as EncryptionManager; use OCP\IConfig; use OCP\IDBConnection; @@ -352,6 +353,10 @@ class Manager implements IManager { $settings[$row['priority']][] = $this->query($row['class']); } catch (QueryException $e) { // 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']); } }