[VD:LocalFileSystem] fix Studio-42#1494 support root path with drive …

…letter
RealX · Jun 29, 2016 · 2e9f5b3 · 2e9f5b3
1 parent 4c1823c
commit 2e9f5b3
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/php/elFinderVolumeLocalFileSystem.class.php b/php/elFinderVolumeLocalFileSystem.class.php
@@ -285,6 +285,11 @@ protected function _normpath($path) {
 
 		$changeSep = (DIRECTORY_SEPARATOR !== '/');
 		if ($changeSep) {
+			$drive = '';
+			if (preg_match('/^([a-zA-Z]:)(.*)/', $path, $m)) {
+				$drive = $m[1];
+				$path = $m[2]? $m[2] : '/';
+			}
 			$path = str_replace(DIRECTORY_SEPARATOR, '/', $path);
 		}
 
@@ -324,7 +329,7 @@ protected function _normpath($path) {
 		}
 
 		if ($changeSep) {
-			$path = str_replace('/', DIRECTORY_SEPARATOR, $path);
+			$path = $drive . str_replace('/', DIRECTORY_SEPARATOR, $path);
 		}
 
 		return $path ? $path : '.';