From afa7d0488698877546d62a377960eaf29024773a Mon Sep 17 00:00:00 2001
From: October CMS <hello@octobercms.com>
Date: Thu, 13 Jul 2023 20:10:04 +1000
Subject: [PATCH] Include query and fragment in relative URLs

---
 src/Html/UrlServiceProvider.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Html/UrlServiceProvider.php b/src/Html/UrlServiceProvider.php
index 7987973a4..6ded82cd0 100644
--- a/src/Html/UrlServiceProvider.php
+++ b/src/Html/UrlServiceProvider.php
@@ -59,7 +59,10 @@ public function registerRelativeHelper()
         $provider = $this->app['url'];
 
         $provider->macro('toRelative', function($url) use ($provider) {
-            return parse_url($provider->to($url), PHP_URL_PATH);
+            $fullUrl = $provider->to($url);
+            return parse_url($fullUrl, PHP_URL_PATH)
+                . (($query = parse_url($fullUrl, PHP_URL_QUERY)) ? '?' . $query : '')
+                . (($query = parse_url($fullUrl, PHP_URL_FRAGMENT)) ? '#' . $query : '');
         });
     }