summaryrefslogtreecommitdiffstats
path: root/lib/private/files
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-04-15 11:19:31 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-04-23 12:54:26 +0200
commit652d417a585ede1564456c446577aa1752253ccd (patch)
tree068b69d1996342739e1ccba556d83eed48195fb8 /lib/private/files
parentb712393e72fc22dc9d38f074b2eca848e6439bcf (diff)
downloadnextcloud-server-652d417a585ede1564456c446577aa1752253ccd.tar.gz
nextcloud-server-652d417a585ede1564456c446577aa1752253ccd.zip
we don't allow to share a folder if it contains a share mount point
Diffstat (limited to 'lib/private/files')
-rw-r--r--lib/private/files/view.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 3f73632be13..a61d58aaf24 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1168,7 +1168,8 @@ class View {
* @var \OC\Files\Mount\Mount $mount
*/
$cache = $mount->getStorage()->getCache();
- if ($internalPath = $cache->getPathById($id)) {
+ $internalPath = $cache->getPathById($id);
+ if (is_string($internalPath)) {
$fullPath = $mount->getMountPoint() . $internalPath;
if (!is_null($path = $this->getRelativePath($fullPath))) {
return $path;