From cf9f85dc8121a359d550ffa3b735fb48859eee88 Mon Sep 17 00:00:00 2001 From: donncha Date: Thu, 24 Apr 2008 11:45:39 +0000 Subject: Merged with WP 2.5, revision 7806 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1260 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-settings.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'wp-settings.php') diff --git a/wp-settings.php b/wp-settings.php index 9554dc5..59d0d1e 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -69,10 +69,12 @@ if ( empty( $_SERVER['REQUEST_URI'] ) ) { else { // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice) - if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] ) - $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO']; - else - $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO']; + if ( isset($_SERVER['PATH_INFO']) ) { + if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] ) + $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO']; + else + $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO']; + } // Append the query string if it exists and isn't null if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) { -- cgit