diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-05-28 11:31:33 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-05-28 11:31:33 +0200 |
| commit | 474c99e19a73bcb3ce378c12f0629ee1eac059b5 (patch) | |
| tree | 06aac29e1b92781ad7b964ed9f78fa56861d17a4 /settings | |
| parent | e1483f65c3cd800f90e962764b06bf2379ca4432 (diff) | |
| parent | 0de59acb491ae8673f6a059c7ddd469ab294d66b (diff) | |
| download | nextcloud-server-474c99e19a73bcb3ce378c12f0629ee1eac059b5.tar.gz nextcloud-server-474c99e19a73bcb3ce378c12f0629ee1eac059b5.zip | |
Merge pull request #16577 from owncloud/enc_improve_migration
only request encryption module for files which are not excluded
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/controller/encryptioncontroller.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/settings/controller/encryptioncontroller.php b/settings/controller/encryptioncontroller.php index 800982d1f04..411b9e87cc1 100644 --- a/settings/controller/encryptioncontroller.php +++ b/settings/controller/encryptioncontroller.php @@ -82,12 +82,13 @@ class EncryptionController extends Controller { public function startMigration() { // allow as long execution on the web server as possible set_time_limit(0); - $migration = new Migration($this->config, $this->view, $this->connection); - $migration->reorganizeSystemFolderStructure(); - $migration->updateDB(); try { + $migration = new Migration($this->config, $this->view, $this->connection); + $migration->reorganizeSystemFolderStructure(); + $migration->updateDB(); + foreach ($this->userManager->getBackends() as $backend) { $limit = 500; |