Merge branch 'master' into remove_unused_vars

Conflicts:
	apps/files_encryption/lib/util.php

diff --cc apps/files_encryption/lib/util.php
index 7f34d21682d0bbeb22a7e42064896bbb8c019a09,4171b7cae5053cc723df65616fd0fd8cd8c99fb4..8bd44d4e11d6b6d92b715bee15c48eab141c0336
--- 1/apps/files_encryption/lib/util.php
--- 2/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@@ -717,27 -744,30 +744,30 @@@ class Util 
                                        }
  
                                        // Fetch public keys for all users who will share the file
-                                       $publicKeys = Keymanager::getPublicKeys( $this->view, $uniqueUserIds );
+                                       $publicKeys = Keymanager::getPublicKeys($this->view, $uniqueUserIds);
  
                                        // Recrypt data, generate catfile
 -                                      $recrypted = Crypt::legacyKeyRecryptKeyfile($legacyData, $legacyPassphrase, $publicKeys, $newPassphrase, $legacyFile['path']);
 +                                      $recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKeys );
  
                                        $rawPath = $legacyFile['path'];
-                                       $relPath = $this->stripUserFilesPath( $rawPath );
+                                       $relPath = $this->stripUserFilesPath($rawPath);
  
                                        // Save keyfile
-                                       Keymanager::setFileKey( $this->view, $relPath, $this->userId, $recrypted['filekey'] );
+                                       Keymanager::setFileKey($this->view, $relPath, $this->userId, $recrypted['filekey']);
  
                                        // Save sharekeys to user folders
-                                       Keymanager::setShareKeys( $this->view, $relPath, $recrypted['sharekeys'] );
+                                       Keymanager::setShareKeys($this->view, $relPath, $recrypted['sharekeys']);
  
                                        // Overwrite the existing file with the encrypted one
-                                       $this->view->file_put_contents( $rawPath, $recrypted['data'] );
+                                       $this->view->file_put_contents($rawPath, $recrypted['data']);
  
-                                       $size = strlen( $recrypted['data'] );
+                                       $size = strlen($recrypted['data']);
  
                                        // Add the file to the cache
-                                       \OC\Files\Filesystem::putFileInfo( $rawPath, array( 'encrypted' => true, 'size' => $size ), '' );
+                                       \OC\Files\Filesystem::putFileInfo($rawPath, array(
+                                                                                                                                        'encrypted' => true,
+                                                                                                                                        'size' => $size
+                                                                                                                               ), '');
                                }
                        }