Make toRelative check the config internally

octobercms · Dec 3, 2023 · 9572a6b · 9572a6b
1 parent dfcc9b2
commit 9572a6b
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Html/UrlServiceProvider.php b/src/Html/UrlServiceProvider.php
@@ -1,6 +1,7 @@
 <?php namespace October\Rain\Html;
 
 use Str;
+use Config;
 use Illuminate\Support\ServiceProvider;
 
 /**
@@ -59,10 +60,14 @@ public function registerRelativeHelper()
         $provider = $this->app['url'];
 
         $provider->macro('toRelative', function($url) use ($provider) {
-            $fullUrl = $provider->to($url);
-            return parse_url($fullUrl, PHP_URL_PATH)
-                . (($query = parse_url($fullUrl, PHP_URL_QUERY)) ? '?' . $query : '')
-                . (($fragment = parse_url($fullUrl, PHP_URL_FRAGMENT)) ? '#' . $fragment : '');
+            if (Config::get('system.relative_links', false)) {
+                $fullUrl = $provider->to($url);
+                return parse_url($fullUrl, PHP_URL_PATH)
+                    . (($query = parse_url($fullUrl, PHP_URL_QUERY)) ? '?' . $query : '')
+                    . (($fragment = parse_url($fullUrl, PHP_URL_FRAGMENT)) ? '#' . $fragment : '');
+            }
+
+            return $provider->to($url);
         });
     }