fix some edge cases while scanning the root of a storage

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 4e3eb1989b7..724c83b3618 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -143,8 +143,8 @@ class Filesystem {
 	 * @return string
 	 */
 	static public function getMountPoint($path) {
-		\OC_Hook::emit(self::CLASSNAME, 'get_mountpoint', array('path' => $path));
 		$path = self::normalizePath($path) . '/';
+		\OC_Hook::emit(self::CLASSNAME, 'get_mountpoint', array('path' => $path));
 		$foundMountPoint = '';
 		$mountPoints = array_keys(self::$mounts);
 		foreach ($mountPoints as $mountpoint) {
@@ -205,7 +205,7 @@ class Filesystem {
 		$mountpoint = self::getMountPoint($path);
 		if ($mountpoint) {
 			$storage = self::getStorage($mountpoint);
-			if ($mountpoint === $path) {
+			if ($mountpoint === $path or $mountpoint . '/' === $path) {
 				$internalPath = '';
 			} else {
 				$internalPath = substr($path, strlen($mountpoint));