summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2015-05-27 13:01:32 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2015-05-27 15:47:40 +0200
commit0de59acb491ae8673f6a059c7ddd469ab294d66b (patch)
treea1ef27f8bea4da2b78377ae6f489b80a11aeaa5d /settings
parent3de945d13da0016cd8c602867ff18a33c2534418 (diff)
downloadnextcloud-server-0de59acb491ae8673f6a059c7ddd469ab294d66b.tar.gz
nextcloud-server-0de59acb491ae8673f6a059c7ddd469ab294d66b.zip
only request encryption module for files which are not excluded
Diffstat (limited to 'settings')
-rw-r--r--settings/controller/encryptioncontroller.php7
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;