diff --git a/apps/files_sharing/lib/sharedmount.php b/apps/files_sharing/lib/sharedmount.php index 84eb4e7877..79d6991264 100644 --- a/apps/files_sharing/lib/sharedmount.php +++ b/apps/files_sharing/lib/sharedmount.php @@ -1,6 +1,6 @@ + * Copyright (c) 2014 Robin Appelman * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. @@ -14,7 +14,7 @@ use OC\Files\Mount\MoveableMount; use OC\Files\Storage\Shared; /** - * Person mount points can be moved by the user + * Shared mount points can be moved by the user */ class SharedMount extends Mount implements MoveableMount { /** diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index c98cde0a8e..ea0e420a5c 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -293,6 +293,7 @@ class Shared extends \OC\Files\Storage\Common { $relPath1 = $this->getMountPoint() . '/' . $path1; $relPath2 = $this->getMountPoint() . '/' . $path2; + // check for update permissions on the share if ($this->isUpdatable('')) { $pathinfo = pathinfo($relPath1); diff --git a/apps/files_sharing/tests/share.php b/apps/files_sharing/tests/share.php index a81f84ef06..195fac461b 100644 --- a/apps/files_sharing/tests/share.php +++ b/apps/files_sharing/tests/share.php @@ -3,7 +3,7 @@ * ownCloud * * @author Bjoern Schiessle - * @copyright 2013 Bjoern Schiessle + * @copyright 2014 Bjoern Schiessle * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/private/files/mount/mount.php b/lib/private/files/mount/mount.php index 7561cd7311..04bccbcab8 100644 --- a/lib/private/files/mount/mount.php +++ b/lib/private/files/mount/mount.php @@ -142,6 +142,7 @@ class Mount { } else { $internalPath = substr($path, strlen($this->mountPoint)); } + // substr returns false instead of an empty string, we always want a string return (string)$internalPath; }