Merge branch 'master' into folderid-reuse

1 files changed, 11 insertions, 1 deletions

diff --git a/lib/private/files.php b/lib/private/files.php
index 4a6b9d8ca0e..656d6f044ca 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -32,6 +32,9 @@ class OC_Files {
 		return \OC\Files\Filesystem::getFileInfo($path, $includeMountPoints);
 	}
 
+	/**
+	 * @param string $path
+	 */
 	static public function getDirectoryContent($path){
 		return \OC\Files\Filesystem::getDirectoryContent($path);
 	}
@@ -103,7 +106,12 @@ class OC_Files {
 			if ($xsendfile) {
 				$filename = OC_Helper::moveToNoClean($filename);
 			}
-			$name = $files . '.zip';
+			// downloading root ?
+			if ($files === '') {
+				$name = 'download.zip';
+			} else {
+				$name = $files . '.zip';
+			}
 			set_time_limit($executionTime);
 		} else {
 			$zip = false;
@@ -205,6 +213,8 @@ class OC_Files {
 		$dirname=basename($dir);
 		$zip->addEmptyDir($internalDir.$dirname);
 		$internalDir.=$dirname.='/';
+		// prevent absolute dirs
+		$internalDir = ltrim($internalDir, '/');
 		$files=OC_Files::getDirectoryContent($dir);
 		foreach($files as $file) {
 			$filename=$file['name'];