aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/startup.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/startup.php')
-rw-r--r--phpBB/includes/startup.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php
index 92639fc5bd..9bbbf4fd4c 100644
--- a/phpBB/includes/startup.php
+++ b/phpBB/includes/startup.php
@@ -105,7 +105,7 @@ function deregister_globals()
function phpbb_has_trailing_path($phpEx)
{
// Check if path_info is being used
- if (!empty($_SERVER['PATH_INFO']) || !empty($_SERVER['ORIG_PATH_INFO']))
+ if (!empty($_SERVER['PATH_INFO']) || (!empty($_SERVER['ORIG_PATH_INFO']) && $_SERVER['SCRIPT_NAME'] != $_SERVER['ORIG_PATH_INFO']))
{
return true;
}