diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-10-18 11:10:55 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-10-19 00:15:01 +0200 |
| commit | 15bbe0210670d5b23b265628209b9b3de50d0fd6 (patch) | |
| tree | 1d58f2cebad6579edf879a94e8d2d3ee4887e14f /lib/private/Repair.php | |
| parent | d0a3d17912cbbf31e6a5dd93aa190c48283de1cc (diff) | |
| download | nextcloud-server-15bbe0210670d5b23b265628209b9b3de50d0fd6.tar.gz nextcloud-server-15bbe0210670d5b23b265628209b9b3de50d0fd6.zip | |
Ignore failures of collation change in the pre update step
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/Repair.php')
| -rw-r--r-- | lib/private/Repair.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Repair.php b/lib/private/Repair.php index 2ba118b9c37..7a5ef9fbd9e 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -129,6 +129,7 @@ class Repair implements IOutput{ */ public static function getRepairSteps() { return [ + new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false), new RepairMimeTypes(\OC::$server->getConfig()), new RepairLegacyStorages(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()), new AssetCache(), @@ -179,7 +180,7 @@ class Repair implements IOutput{ $connection = \OC::$server->getDatabaseConnection(); $steps = [ new InnoDB(), - new Collation(\OC::$server->getConfig(), $connection), + new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true), new SqliteAutoincrement($connection), new SearchLuceneTables(), ]; |