Merge branch 'master' into files_encryption_upgrade_fix

Conflicts:
	apps/files_encryption/lib/util.php

1 files changed, 13 insertions, 10 deletions

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 4e0e5c4b958..02602989087 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -327,6 +327,12 @@ class Hooks {
 

 			$sharingEnabled = \OCP\Share::isEnabled();

 

+			// get the path including mount point only if not a shared folder

+			if(strncmp($path, '/Shared' , strlen('/Shared') !== 0)) {

+				// get path including the the storage mount point

+				$path = $util->getPathWithMountPoint($params['itemSource']);

+			}

+

 			// if a folder was shared, get a list of all (sub-)folders

 			if ($params['itemType'] === 'folder') {

 				$allFiles = $util->getAllFiles($path);

@@ -376,17 +382,11 @@ class Hooks {
 

 				// rebuild path

 				foreach ($targetPathSplit as $pathPart) {

-

 					if ($pathPart !== $sharedPart) {

-

 						$path = '/' . $pathPart . $path;

-

 					} else {

-

 						break;

-

 					}

-

 				}

 

 				// prefix path with Shared

@@ -404,13 +404,16 @@ class Hooks {
 				}

 			}

 

+			// get the path including mount point only if not a shared folder

+			if(strncmp($path, '/Shared' , strlen('/Shared') !== 0)) {

+				// get path including the the storage mount point

+				$path = $util->getPathWithMountPoint($params['itemSource']);

+			}

+

 			// if we unshare a folder we need a list of all (sub-)files

 			if ($params['itemType'] === 'folder') {

-

-				$allFiles = $util->getAllFiles($path);

-

+				$allFiles = $util->getAllFiles( $path );

 			} else {

-

 				$allFiles = array($path);

 			}