From 0163884ef61bca4268621ef948b8cf21360b7b7f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 15 Sep 2024 07:17:48 +0300 Subject: add another test for self url, split regex into two parts - one for plugins, one for everything else --- classes/Config.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'classes/Config.php') diff --git a/classes/Config.php b/classes/Config.php index be9dd04e8..e9d44063c 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -490,7 +490,8 @@ 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,}|\/plugins(.local)?\/.{1,}\/{1,})?(\w+\.php)?(\?.*$)?$/", "", $self_url_path); + $self_url_path = preg_replace("/(\/api\/{1,})?(\w+\.php)?(\?.*$)?$/", "", $self_url_path); + $self_url_path = preg_replace("/(\/plugins(.local))\/.{1,}$/", "", $self_url_path); return rtrim($self_url_path, "/"); } -- cgit v1.2.3-54-g00ecf