diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-24 15:32:29 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-24 15:32:29 +0200 |
| commit | 7b150dfa963d81889b8d40bf3956795c9a712aec (patch) | |
| tree | 30b73d83b7e59791848480a741390060d60c7605 /lib/files.php | |
| parent | 56c7ee799cb13f7a4db60663f60b76cdf223614b (diff) | |
| parent | 41898a473e8ece37c92e709f685c90d7952d1694 (diff) | |
| download | nextcloud-server-7b150dfa963d81889b8d40bf3956795c9a712aec.tar.gz nextcloud-server-7b150dfa963d81889b8d40bf3956795c9a712aec.zip | |
merge master into filesystem
Diffstat (limited to 'lib/files.php')
| -rw-r--r-- | lib/files.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/files.php b/lib/files.php index a5eec1f2a63..ff9befa89e5 100644 --- a/lib/files.php +++ b/lib/files.php @@ -141,8 +141,8 @@ class OC_Files { /** * return the content of a file or return a zip file containning multiply files * - * @param dir $dir - * @param file $file ; seperated list of files to download + * @param string $dir + * @param string $file ; seperated list of files to download * @param boolean $only_header ; boolean to only send header of the request */ public static function get($dir, $files, $only_header = false) { @@ -162,7 +162,7 @@ class OC_Files { foreach ($files as $file) { $file = $dir . '/' . $file; if (\OC\Files\Filesystem::is_file($file)) { - $tmpFile = OC_F\OC\Files\Filesystemilesystem::toTmpFile($file); + $tmpFile = \OC\Files\Filesystem::toTmpFile($file); self::$tmpFiles[] = $tmpFile; $zip->addFile($tmpFile, basename($file)); } elseif (\OC\Files\Filesystem::is_dir($file)) { |