Browse Source

Remove wrong entry in admin_settings that causes 500

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
pull/7230/head
Morris Jobke 8 years ago
parent
commit
6fd51426bf
No known key found for this signature in database GPG Key ID: FE03C3A163FEDE68
  1. 5
      lib/private/Settings/Manager.php

5
lib/private/Settings/Manager.php

@ -32,6 +32,7 @@ namespace OC\Settings;
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;
@ -471,6 +472,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']);
}
}

Loading…
Cancel
Save