From 8d6d1af3931fb7159002e22c2513c069415dcb03 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 21 Apr 2008 17:35:20 +0000 Subject: [PATCH] Check if PATH_INFO is set to avoid undefined index errors. see #5160 git-svn-id: http://svn.automattic.com/wordpress/trunk@7757 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-settings.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wp-settings.php b/wp-settings.php index ae551eab1..1480288e0 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'])) {