diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2012-12-12 12:13:54 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2012-12-12 12:13:54 +0100 |
| commit | 57780bfa37f3269e42b70a0f4296d6af424d7f95 (patch) | |
| tree | 10789455a3c869f1a8310157e675c32a0423c92c | |
| parent | cc948fe354193f0ae04250b56cc4f16b5771aa49 (diff) | |
| download | nextcloud-server-57780bfa37f3269e42b70a0f4296d6af424d7f95.tar.gz nextcloud-server-57780bfa37f3269e42b70a0f4296d6af424d7f95.zip | |
fix warning if the size of the Shared-folder gets calculated
| -rw-r--r-- | apps/files/ajax/download.php | 5 | ||||
| -rw-r--r-- | lib/filesystemview.php | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php index b9a4ddaf5e7..c58c536d77b 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 3e2cde68a15..7dde0f7bf2b 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); |