Skip to content

Commit

Permalink
Remove wrong entry in admin_settings that causes 500
Browse files Browse the repository at this point in the history
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
  • Loading branch information
MorrisJobke committed Nov 20, 2017
1 parent f347e2e commit 6fd5142
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions lib/private/Settings/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
use OC\Accounts\AccountManager;
use OCP\App\IAppManager;
use OCP\AppFramework\QueryException;
use OCP\AutoloadNotAllowedException;
use OCP\Encryption\IManager as EncryptionManager;
use OCP\IConfig;
use OCP\IDBConnection;
Expand Down Expand Up @@ -471,6 +472,10 @@ public function getAdminSettings($section) {
$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']);
}
}

Expand Down

0 comments on commit 6fd5142

Please sign in to comment.