[2.x] fix: resolve email logo URL via flarum-assets disk

framework/core/src/Mail/MailServiceProvider.php

@@ -14,8 +14,10 @@
 use Flarum\User\UserRepository;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
 use Illuminate\Contracts\Mail\Mailer as MailerContract;
 use Illuminate\Contracts\Validation\Factory;
+use Illuminate\Contracts\View\Factory as ViewFactory;
 use Illuminate\Mail\Events\MessageSending;
 use Illuminate\Support\Arr;
 use Psr\Log\LoggerInterface;
@@ -99,8 +101,18 @@ public function register(): void
         });
     }
 
-    public function boot(Dispatcher $events): void
-    {
+    public function boot(
+        Dispatcher $events,
+        ViewFactory $views,
+        FilesystemFactory $filesystemFactory,
+        SettingsRepositoryInterface $settings,
+    ): void {
         $events->listen(MessageSending::class, MutateEmail::class);
+
+        // Resolve the logo URL via the flarum-assets disk so it stays correct on
+        // installs whose assets are served from a remote bucket / CDN — same path
+        // ForumResource::getLogoUrl() uses for the frontend.
+        $logoPath = $settings->get('logo_path');
+        $views->share('logoUrl', $logoPath ? $filesystemFactory->disk('flarum-assets')->url($logoPath) : null);
     }
 }

framework/core/views/email/html.blade.php

@@ -50,8 +50,8 @@
 <div class="header">
     <div class="Header-title">
         <a href="{{ $url->to('forum')->base() }}" id="home-link">
-            @if ($settings->get('logo_path'))
-                <img src="{{ $url->to('forum')->base() . '/assets/' . $settings->get('logo_path') }}" alt="{{ $settings->get('forum_title') }}" class="Header-logo">
+            @if ($logoUrl)
+                <img src="{{ $logoUrl }}" alt="{{ $settings->get('forum_title') }}" class="Header-logo">
             @else
                 {{ $settings->get('forum_title') }}
             @endif