fix default folder logic

streamtw · streamtw · commit 378ebfb6924f · 2017-03-23T14:35:27.000+08:00
diff --git a/src/controllers/FolderController.php b/src/controllers/FolderController.php
@@ -22,7 +22,7 @@ public function getFolders()
             $folder_types['user'] = 'root';
         }
 
-        if (parent::allowMultiUser() && parent::enabledShareFolder()) {
+        if ((parent::allowMultiUser() && parent::enabledShareFolder()) || !parent::allowMultiUser()) {
             $folder_types['share'] = 'shares';
         }
 
diff --git a/src/traits/LfmHelpers.php b/src/traits/LfmHelpers.php
@@ -72,7 +72,7 @@ private function getFormatedWorkingDir()
     {
         $working_dir = request('working_dir');
 
-        if (is_null($working_dir)) {
+        if (empty($working_dir)) {
             $default_folder_type = 'share';
             if ($this->allowMultiUser()) {
                 $default_folder_type = 'user';

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function getFolders()`
`22`	`22`	`$folder_types['user'] = 'root';`
`23`	`23`	`}`
`24`	`24`
`25`		`- if (parent::allowMultiUser() && parent::enabledShareFolder()) {`
	`25`	`+ if ((parent::allowMultiUser() && parent::enabledShareFolder()) \|\| !parent::allowMultiUser()) {`
`26`	`26`	`$folder_types['share'] = 'shares';`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ private function getFormatedWorkingDir()`
`72`	`72`	`{`
`73`	`73`	`$working_dir = request('working_dir');`
`74`	`74`
`75`		`- if (is_null($working_dir)) {`
	`75`	`+ if (empty($working_dir)) {`
`76`	`76`	`$default_folder_type = 'share';`
`77`	`77`	`if ($this->allowMultiUser()) {`
`78`	`78`	`$default_folder_type = 'user';`