From 607a2c483a5c1e2ca629b4c29707e397ecbe614b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 23 Oct 2023 17:26:10 +0200 Subject: [PATCH] [ticket/17201] Add dot for improved dirname for URI ending in slash PHPBB3-17201 --- phpBB/common.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phpBB/common.php b/phpBB/common.php index 088be276a5..c682b7aeef 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -57,8 +57,10 @@ if (!defined('PHPBB_INSTALLED')) $script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF'); } + $script_name = substr($script_name, -1) === '/' ? $script_name . '.' : $script_name; + // $phpbb_root_path accounts for redirects from e.g. /adm - $script_path = trim(substr($script_name, -1) !== '/' ? dirname($script_name) : $script_name) . '/' . $phpbb_root_path . 'install/app.' . $phpEx; + $script_path = trim(dirname($script_name)) . '/' . $phpbb_root_path . 'install/app.' . $phpEx; // Replace any number of consecutive backslashes and/or slashes with a single slash // (could happen on some proxy setups and/or Windows servers) $script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path);