diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-07-16 14:03:21 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-07-16 14:03:21 +0200 |
| commit | d6f02eb703ec69b98f8fecf3ded8bf9f1556cb06 (patch) | |
| tree | 4f1a19c547425d3b405d9417d0d30e3985a29ade /settings | |
| parent | bfb90d10edfc863213522c704f7d0b8bad8c8646 (diff) | |
| parent | 1e284b15ff07b7a90067c5166ee7f85547095a34 (diff) | |
| download | nextcloud-server-d6f02eb703ec69b98f8fecf3ded8bf9f1556cb06.tar.gz nextcloud-server-d6f02eb703ec69b98f8fecf3ded8bf9f1556cb06.zip | |
Merge pull request #17500 from owncloud/encryption_migration_improvements
Only clean up if migration finished succesfully
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/controller/encryptioncontroller.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/settings/controller/encryptioncontroller.php b/settings/controller/encryptioncontroller.php index 411b9e87cc1..87cbf0a4bf1 100644 --- a/settings/controller/encryptioncontroller.php +++ b/settings/controller/encryptioncontroller.php @@ -102,6 +102,8 @@ class EncryptionController extends Controller { } while (count($users) >= $limit); } + $migration->finalCleanUp(); + } catch (\Exception $e) { return array( 'data' => array( |