Don't trim leading slashes on local filesystem base URLs

adamwathan · web-flow · commit acd66fef646f · 2017-04-07T15:38:05.000-04:00
diff --git a/src/Illuminate/Filesystem/FilesystemAdapter.php b/src/Illuminate/Filesystem/FilesystemAdapter.php
@@ -351,7 +351,7 @@ protected function getLocalUrl($path)
         // it as the base URL instead of the default path. This allows the developer to
         // have full control over the base path for this filesystem's generated URLs.
         if ($config->has('url')) {
-            return trim($config->get('url'), '/').'/'.ltrim($path, '/');
+            return rtrim($config->get('url'), '/').'/'.ltrim($path, '/');
         }
 
         $path = '/storage/'.$path;

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ protected function getLocalUrl($path)`
`351`	`351`	`// it as the base URL instead of the default path. This allows the developer to`
`352`	`352`	`// have full control over the base path for this filesystem's generated URLs.`
`353`	`353`	`if ($config->has('url')) {`
`354`		`- return trim($config->get('url'), '/').'/'.ltrim($path, '/');`
	`354`	`+ return rtrim($config->get('url'), '/').'/'.ltrim($path, '/');`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`$path = '/storage/'.$path;`