[Pkg-owncloud-commits] [owncloud] 35/46: if it is not a folder share the path already points to the correct file

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit a5d6e6eb282f2947410c54f22aad1b7308f2558a
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Tue Oct 21 16:20:28 2014 +0200

    if it is not a folder share the path already points to the correct file
---
 apps/files_sharing/public.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index ea84400..2b84cd3 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -90,7 +90,7 @@ if (isset($path)) {
 	}
 	$basePath = $path;
 	$rootName = basename($path);
-	if (isset($_GET['path']) && \OC\Files\Filesystem::isReadable($basePath . $_GET['path'])) {
+	if ($linkItem['item_type'] === 'folder' && isset($_GET['path']) && \OC\Files\Filesystem::isReadable($basePath . $_GET['path'])) {
 		$getPath = \OC\Files\Filesystem::normalizePath($_GET['path']);
 		$path .= $getPath;
 	} else {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git