From d0beb86b3d8ab2592db0cbc03b3d4a49f42a774f Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Thu, 25 Jun 2020 16:17:38 +0200 Subject: [PATCH] Fix LSurl :: get_rewrite_base() method (again) --- src/includes/class/class.LSurl.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/includes/class/class.LSurl.php b/src/includes/class/class.LSurl.php index 92d2266c..8977da23 100644 --- a/src/includes/class/class.LSurl.php +++ b/src/includes/class/class.LSurl.php @@ -314,11 +314,14 @@ class LSurl extends LSlog_staticLoggerClass { **/ private static function get_rewrite_base() { $public_root_url = LSconfig :: get('public_root_url', '/', 'string'); + $rewrite_base = '/'; if (preg_match('|^https?://[^/]+(/.*)$|', $public_root_url, $m)) - return self :: remove_trailing_slash($m[1]).'/'; + return $rewrite_base = $m[1]; elseif (preg_match('|^(/.+)$|', $public_root_url, $m)) - return self :: remove_trailing_slash($m[1]).'/'; - return '/'; + return $rewrite_base = $m[1]; + if ($rewrite_base != '/') + return self :: remove_trailing_slash($rewrite_base).'/'; + return $rewrite_base; } /**