Merge branch 'local_disk_url_root' of https://github.com/shadoWalker8…

…9/framework into shadoWalker89-local_disk_url_root
laravel · Nov 7, 2016 · 051f3c8 · 051f3c8
2 parents 8c8eb21 + 0e1692e
commit 051f3c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Illuminate/Filesystem/FilesystemAdapter.php b/src/Illuminate/Filesystem/FilesystemAdapter.php
@@ -287,6 +287,12 @@ public function url($path)
 
             return $adapter->getClient()->getObjectUrl($adapter->getBucket(), $path);
         } elseif ($adapter instanceof LocalAdapter) {
+            $flysystemConfig = $this->driver->getConfig();
+
+            if ($flysystemConfig->has('url_root')) {
+                return $flysystemConfig->get('url_root').'/'.$path;
+            }
+
             $path = '/storage/'.$path;
 
             return Str::contains($path, '/storage/public') ? Str::replaceFirst('/public', '', $path) : $path;

diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php
@@ -255,7 +255,7 @@ protected function getRackspaceContainer(Rackspace $client, array $config)
      */
     protected function createFlysystem(AdapterInterface $adapter, array $config)
     {
-        $config = Arr::only($config, ['visibility', 'disable_asserts']);
+        $config = Arr::only($config, ['visibility', 'disable_asserts', 'url_root']);
 
         return new Flysystem($adapter, count($config) > 0 ? $config : null);
     }