[Pkg-owncloud-commits] [owncloud] 49/205: remove files_encryption from database at the end of the migration process

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit ed3dc199ae406aba2214ebd7751ef0434501db3b
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Fri Jun 19 14:15:56 2015 +0200

    remove files_encryption from database at the end of the migration process
---
 apps/encryption/lib/migration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/encryption/lib/migration.php b/apps/encryption/lib/migration.php
index e4e5595..3acf77e 100644
--- a/apps/encryption/lib/migration.php
+++ b/apps/encryption/lib/migration.php
@@ -54,6 +54,7 @@ class Migration {
 	public function __destruct() {
 		$this->view->deleteAll('files_encryption/public_keys');
 		$this->updateFileCache();
+		$this->config->deleteAppValue('files_encryption', 'installed_version');
 	}
 
 	/**
@@ -139,7 +140,6 @@ class Migration {
 	public function updateDB() {
 
 		// delete left-over from old encryption which is no longer needed
-		$this->config->deleteAppValue('files_encryption', 'installed_version');
 		$this->config->deleteAppValue('files_encryption', 'ocsid');
 		$this->config->deleteAppValue('files_encryption', 'types');
 		$this->config->deleteAppValue('files_encryption', 'enabled');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git