]> source.dussan.org Git - nextcloud-server.git/commitdiff
workaround to get the unit test going
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 4 Jun 2014 06:21:28 +0000 (08:21 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 4 Jun 2014 06:21:28 +0000 (08:21 +0200)
apps/files_encryption/hooks/hooks.php

index 8fae901fe63202e113d12eb17fb9f51b8e1d8457..d1ee4a97d15a3d06105851bff2865a2ad9e76a93 100644 (file)
@@ -99,12 +99,14 @@ class Hooks {
 \r
                        // Set legacy encryption key if it exists, to support\r
                        // depreciated encryption system\r
-                       $encLegacyKey = $userView->file_get_contents('encryption.key');\r
-                       if ($encLegacyKey) {\r
+                       if ($userView->file_exists('encryption.key')) {\r
+                               $encLegacyKey = $userView->file_get_contents('encryption.key');\r
+                               if ($encLegacyKey) {\r
 \r
-                               $plainLegacyKey = Crypt::legacyDecrypt($encLegacyKey, $params['password']);\r
+                                       $plainLegacyKey = Crypt::legacyDecrypt($encLegacyKey, $params['password']);\r
 \r
-                               $session->setLegacyKey($plainLegacyKey);\r
+                                       $session->setLegacyKey($plainLegacyKey);\r
+                               }\r
                        }\r
 \r
                        // Encrypt existing user files\r