src build elFinder-2.1-c6cb44d

This commit is contained in:
nao-pon
2017-12-14 15:33:56 +09:00
parent 84d693c9ab
commit 32028e4ea2
6 changed files with 14 additions and 8 deletions
+7 -1
View File
@@ -6127,6 +6127,9 @@ abstract class elFinderVolumeDriver {
if ($base[0] === $separator && strpos($base, 0, strlen($systemroot)) !== $systemroot) {
$base = $systemroot . substr($base, 1);
}
if ($base !== $systemroot) {
$base = rtrim($base, $separator);
}
// 'Here'
if ($path === '' || $path === '.' . $separator) return $base;
@@ -6141,7 +6144,10 @@ abstract class elFinderVolumeDriver {
while(preg_match($normreg, $path)) {
$path = preg_replace($normreg, '$1', $path, 1);
}
if ($path !== $systemroot) {
$path = rtrim($path, $separator);
}
// Absolute path
if ($path[0] === $separator || strpos($path, $systemroot) === 0) {
return $path;