Merge branch 'stable5' into fix_enc_migration

diff --cc apps/files_encryption/tests/crypt.php
index dedc190bb7f265d09fa50f13598e401a2a331e80,74b4252a1d46f0bcbcfb5b863df66e9427cfbad9..e9f155e2649cc8ede6d0f61b5dde28abfe6addf4
--- 1/apps/files_encryption/tests/crypt.php
--- 2/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@@ -525,10 -513,9 +513,9 @@@ class Test_Encryption_Crypt extends \PH
         * @brief test decryption using legacy blowfish method
         * @depends testLegacyEncryptShort
         */
-       function testLegacyDecryptShort($crypted)
-       {
+       function testLegacyDecryptShort($crypted) {
  
 -              $decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
 +              $decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
  
                $this->assertEquals($this->dataShort, $decrypted);
  
@@@ -555,10 -541,9 +541,9 @@@
         * @brief test decryption using legacy blowfish method
         * @depends testLegacyEncryptLong
         */
-       function testLegacyDecryptLong($crypted)
-       {
+       function testLegacyDecryptLong($crypted) {
  
 -              $decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
 +              $decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
  
                $this->assertEquals($this->dataLong, $decrypted);