Merge branch 'master' into file_encryption_util_is_error

Conflicts:
	apps/files_encryption/lib/util.php

diff --cc apps/files_encryption/lib/util.php
index f25ead1f5c3cd6ca1288c4360ca24139752335d3,cac67d496e8261ac34e6c5221e8d03138ca072eb..4171b7cae5053cc723df65616fd0fd8cd8c99fb4
--- 1/apps/files_encryption/lib/util.php
--- 2/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@@ -442,12 -421,9 +442,12 @@@ class Util 
  
                                                        // If the file uses old
                                                        // encryption system
-                                               } elseif (Crypt::isLegacyEncryptedContent($this->tail($filePath, 3), $relPath)) {
+                                               } elseif ( Crypt::isLegacyEncryptedContent( $data, $relPath ) ) {
  
 -                                                      $found['legacy'][] = array( 'name' => $file, 'path' => $filePath );
 +                                                      $found['legacy'][] = array(
 +                                                              'name' => $file,
 +                                                              'path' => $filePath
 +                                                      );
  
                                                        // If the file is not encrypted
                                                } else {