Merge pull request #287 from gs11/issue284

Removed trailing slash in subdirectory path added by CakePHP for some folders
Sonerezh · Jul 14, 2017 · 4bb64cf · 4bb64cf
2 parents 75b1ff6 + f5e2acc
commit 4bb64cf
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/Controller/SongsController.php b/app/Controller/SongsController.php
@@ -55,7 +55,13 @@ public function import() {
 
                         // The find method does not return absolute paths.
                         foreach ($found_in_this_directory as $key => $value) {
-                            $found_in_this_directory[$key] = $subdirectory->path . '/' . $value;
+
+                            // CakePHP adds a trailing slash when the path contains two dots in sequence
+                            if(substr($subdirectory->path, -1) === '/') {
+                                $found_in_this_directory[$key] = $subdirectory->path . $value;
+                            } else {
+                                $found_in_this_directory[$key] = $subdirectory->path . '/' . $value;
+                            }
                         }
 
                         $found = array_merge($found, $found_in_this_directory);