Skip to content
This repository has been archived by the owner on Dec 25, 2018. It is now read-only.

Commit

Permalink
Merge pull request #55 from hason/flysystem
Browse files Browse the repository at this point in the history
Fix flysystem _resultPath
  • Loading branch information
helios-ag authored Aug 14, 2017
2 parents 46b2d9b + b72ecab commit 9788fbd
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/Driver/ElFinderVolumeFlysystem.php
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ protected function _resultPath($result, $requestPath)
}
$result = $this->fs->getMetaData($requestPath);
}
$path = ($result && isset($result['path']))? $result['path'] : false;
$path = $result ? (isset($result['path']) ? $result['path'] : $requestPath) : false;
if ($this->fscache && $path !== $requestPath) {
$this->fscache->storeMiss($requestPath);
}
Expand Down Expand Up @@ -418,7 +418,6 @@ protected function _save($fp, $dir, $name, $stat)
$config['mimetype'] = self::$mimetypes[$ext];
}
return $this->_resultPath($this->fs->putStream($path, $fp, $config), $path);
return false;
}
/**
* Get file contents
Expand Down

0 comments on commit 9788fbd

Please sign in to comment.