Merge branch '2.x' into 2.1

This commit is contained in:
nao-pon
2015-01-23 18:05:19 +09:00
+3 -1
View File
@@ -715,8 +715,10 @@ class elFinderVolumeFTP extends elFinderVolumeDriver {
if ($this->tmp) {
$local = $this->tmp.DIRECTORY_SEPARATOR.md5($path);
$fp = @fopen($local, $mode);
$fp = @fopen($local, 'wb');
if (ftp_fget($this->connect, $fp, $path, FTP_BINARY)) {
fclose($fp);
$fp = fopen($local, $mode);
return $fp;
}
@fclose($fp);