[Pkg-owncloud-commits] [owncloud] 204/394: fix warning if the size of the Shared-folder gets calculated

[David Prévot]

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

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit 57780bfa37f3269e42b70a0f4296d6af424d7f95
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Wed Dec 12 12:13:54 2012 +0100

    fix warning if the size of the Shared-folder gets calculated
---
 apps/files/ajax/download.php |    5 +++++
 lib/filesystemview.php       |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php
index b9a4dda..c58c536 100644
--- a/apps/files/ajax/download.php
+++ b/apps/files/ajax/download.php
@@ -33,4 +33,9 @@ OCP\User::checkLoggedIn();
 $files = $_GET["files"];
 $dir = $_GET["dir"];
 
+if ($files == "Shared" and $dir == "/") {
+	$files = '';
+	$dir = "/Shared";
+}
+
 OC_Files::get($dir, $files, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 3e2cde6..7dde0f7 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -174,7 +174,7 @@ class OC_FilesystemView {
 		return $fsLocal->readdir( $handle );
 	}
 	public function is_dir($path) {
-		if($path=='/' || $path == '/Shared') {
+		if($path=='/') {
 			return true;
 		}
 		return $this->basicOperation('is_dir', $path);

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