Merge pull request Studio-42#1002 from therevmj/2.x

Fix edge case when the root is / and no alias is provided.
pombreda · Mar 28, 2015 · c611182 · c611182
2 parents 68dcaf7 + 8702879
commit c611182
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/php/elFinderVolumeDriver.class.php b/php/elFinderVolumeDriver.class.php
@@ -721,6 +721,11 @@ public function mount(array $opts) {
 		}
 
 		$this->rootName = empty($this->options['alias']) ? $this->_basename($this->root) : $this->options['alias'];
+
+                // This get's triggered if $this->root == '/' and alias is empty.
+                // Maybe modify _basename instead?
+                if (empty($this->rootName)) $this->rootName = $this->separator;
+
 		$root = $this->stat($this->root);
 
 		if (!$root) {