Merge pull request #11386 from nanaya/rel-link

Set correct base url for relative link
ppy · Aug 2, 2024 · 2654787 · 2654787
2 parents a486125 + 042e841
commit 2654787
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 25 deletions.
diff --git a/resources/js/core/fix-relative-link.ts b/resources/js/core/fix-relative-link.ts
diff --git a/resources/js/osu-core.ts b/resources/js/osu-core.ts
@@ -12,7 +12,6 @@ import Captcha from 'core/captcha';
 import ClickMenu from 'core/click-menu';
 import CurrentUserObserver from 'core/current-user-observer';
 import Enchant from 'core/enchant';
-import FixRelativeLink from 'core/fix-relative-link';
 import ForumPoll from 'core/forum/forum-poll';
 import ForumPostEdit from 'core/forum/forum-post-edit';
 import ForumPostInput from 'core/forum/forum-post-input';
@@ -60,7 +59,6 @@ export default class OsuCore {
   readonly currentUserObserver;
   readonly dataStore;
   readonly enchant;
-  readonly fixRelativeLink;
   readonly forumPoll;
   readonly forumPostEdit;
   readonly forumPostInput;
@@ -112,7 +110,6 @@ export default class OsuCore {
     this.clickMenu = new ClickMenu();
     this.currentUserObserver = new CurrentUserObserver(this);
     this.currentUserModel = new UserModel(this);
-    this.fixRelativeLink = new FixRelativeLink();
     this.forumPoll = new ForumPoll();
     this.forumPostEdit = new ForumPostEdit();
     this.forumPostInput = new ForumPostInput();

diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
@@ -49,6 +49,7 @@
     <head>
         @include("layout.metadata")
         <title>{!! $title !!}</title>
+        <base href="{{ Request::getSchemeAndHttpHost().Request::getRequestUri() }}" />
     </head>
 
     <body