(REF) Extract method CRM_Utils_Url::toRelative()

diff --git a/CRM/Utils/Url.php b/CRM/Utils/Url.php
index 51340c3f723159843053f720f4ac01fd27236649..5a40beb5a0a6838f91f2f40c6bc8317482607d9b 100644 (file)
--- a/CRM/Utils/Url.php
+++ b/CRM/Utils/Url.php
@@ -36,4 +36,18 @@ class CRM_Utils_Url {
     return $parsed->__toString();
   }
 
+  /**
+   * Convert to a relative URL (if host/port matches).
+   *
+   * @param string $value
+   * @return string
+   */
+  public static function toRelative(string $value): string {
+    $parsed = parse_url($value);
+    if (isset($_SERVER['HTTP_HOST']) && isset($parsed['host']) && $_SERVER['HTTP_HOST'] == $parsed['host']) {
+      $value = $parsed['path'];
+    }
+    return $value;
+  }
+
 }

diff --git a/Civi/Core/Paths.php b/Civi/Core/Paths.php
index 478141eb12063358f25cbd5ca4fa2dc3cb907ba2..910353c1ac66a000049dc6b99aaa73225010b04d 100644 (file)
--- a/Civi/Core/Paths.php
+++ b/Civi/Core/Paths.php
@@ -256,10 +256,7 @@ class Paths {
     $value = rtrim($this->getVariable($defaultContainer, 'url'), '/') . ($isDot ? '' : "/$value");
 
     if ($preferFormat === 'relative') {
-      $parsed = parse_url($value);
-      if (isset($_SERVER['HTTP_HOST']) && isset($parsed['host']) && $_SERVER['HTTP_HOST'] == $parsed['host']) {
-        $value = $parsed['path'];
-      }
+      $value = \CRM_Utils_Url::toRelative($value);
     }
 
     if ($ssl || ($ssl === NULL && \CRM_Utils_System::isSSL())) {