[Pkg-owncloud-commits] [owncloud] 174/394: detect '/Shared' as directory. This solves the problem described in issue #674

[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 cc948fe354193f0ae04250b56cc4f16b5771aa49
Author: Björn Schießle <schiessle at owncloud.com>
Date:   Tue Dec 4 12:21:00 2012 +0100

    detect '/Shared' as directory. This solves the problem described in issue #674
---
 lib/files.php          |    2 +-
 lib/filesystemview.php |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/files.php b/lib/files.php
index e5f244e..f2ae8af 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -165,7 +165,7 @@ class OC_Files {
 			}
 			$zip->close();
 			set_time_limit($executionTime);
-		}elseif(OC_Filesystem::is_dir($dir.'/'.$files)) {
+		}elseif(OC_Filesystem::is_dir(OC_Files::normalizePath($dir.'/'.$files))) {
 			self::validateZipDownload($dir,$files);
 			$executionTime = intval(ini_get('max_execution_time'));
 			set_time_limit(0);
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 7dde0f7..3e2cde6 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=='/') {
+		if($path=='/' || $path == '/Shared') {
 			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