From 78c903cb7f10ae2e3f1f7ed6af65d99a229d4e03 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 14 Sep 2024 10:53:40 +0300 Subject: fix Config::get_self_url() invoked from plugin context, better deal with multiple trailing slashes in URL, update phpunit image path --- classes/Config.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'classes') diff --git a/classes/Config.php b/classes/Config.php index a1886e877..be9dd04e8 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -490,13 +490,9 @@ class Config { $proto = self::is_server_https() ? 'https' : 'http'; $self_url_path = $proto . '://' . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH); - $self_url_path = preg_replace("/(\/api\/{1,})?(\w+\.php)?(\?.*$)?$/", "", $self_url_path); + $self_url_path = preg_replace("/(\/api\/{1,}|\/plugins(.local)?\/.{1,}\/{1,})?(\w+\.php)?(\?.*$)?$/", "", $self_url_path); - if (substr($self_url_path, -1) === "/") { - return substr($self_url_path, 0, -1); - } else { - return $self_url_path; - } + return rtrim($self_url_path, "/"); } } /* sanity check stuff */ -- cgit v1.2.3-54-g00ecf