[5.x] Asset Container returns relative url for same site (#11372)

Co-authored-by: Jason Varga <[email protected]>

src/Assets/AssetContainer.php

@@ -27,6 +27,7 @@
 use Statamic\Facades\Stache;
 use Statamic\Facades\URL;
 use Statamic\Support\Arr;
+use Statamic\Support\Str;
 use Statamic\Support\Traits\FluentlyGetsAndSets;
 
 class AssetContainer implements Arrayable, ArrayAccess, AssetContainerContract, Augmentable
@@ -138,7 +139,9 @@ public function url()
             return null;
         }
 
-        $url = rtrim($this->disk()->url('/'), '/');
+        $url = (string) Str::of($this->disk()->url('/'))
+            ->rtrim('/')
+            ->after(config('app.url'));
 
         return ($url === '') ? '/' : $url;
     }

tests/Assets/AssetContainerTest.php

@@ -137,6 +137,21 @@ public function it_gets_the_url_from_the_disk_config_when_its_relative()
         $this->assertEquals('http://localhost/container', $container->absoluteUrl());
     }
 
+    #[Test]
+    public function it_gets_the_url_from_the_disk_config_when_its_app_url()
+    {
+        config(['filesystems.disks.test' => [
+            'driver' => 'local',
+            'root' => __DIR__.'/__fixtures__/container',
+            'url' => 'http://localhost/container',
+        ]]);
+
+        $container = (new AssetContainer)->disk('test');
+
+        $this->assertEquals('/container', $container->url());
+        $this->assertEquals('http://localhost/container', $container->absoluteUrl());
+    }
+
     #[Test]
     public function its_private_if_the_disk_has_no_url()
     {