admin/Studio-42-elFinder
1
0
Fork 0
mirror of https://github.com/Studio-42/elFinder synced 2026-06-08 12:37:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

src build elFinder-2.1-0df9f09

Browse Source
This commit is contained in:
nao-pon
2016-03-19 16:42:51 +09:00
parent 6f4cb1ac58
commit 83fb7e4b4a
6 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
php/elFinderVolumeDriver.class.php
+19 -4
View File
@@ -1812,9 +1812,13 @@ abstract class elFinderVolumeDriver {
return false;
}
$stat = $this->stat($path);
// Try get URL
if (empty($stat['url']) && ($url = $this->getContentUrl($stat['hash']))) {
$stat['url'] = $url;
}
return $this->stat($path);
return $stat;
}
/**
@@ -2372,10 +2376,21 @@ abstract class elFinderVolumeDriver {
* @author Naoki Sawada
*/
public function getContentUrl($hash, $options = array()) {
if (($file = $this->file($hash)) == false || !$file['url'] || $file['url'] == 1) {
if (($file = $this->file($hash)) == false || (isset($file['url']) && $file['url'] == 1)) {
return false;
}
return $file['url'];
if (empty($file['url'])) {
if ($this->URL) {
$path = str_replace($this->separator, '/', substr($this->decode($hash), strlen($this->root) + 1));
if ($this->encoding) {
$path = str_replace('%2F', '/', rawurlencode($this->convEncIn($path, true)));
}
return $this->URL . $path;
}
return false;
} else {
return $file['url'];
}
}
/**