[wp-cvs] wordpress wp-settings.php,1.60,1.61

[Ryan Boren]

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23674

Modified Files:
	wp-settings.php 
Log Message:
Do not touch REQUEST_URI if it is already set by the server. 

Index: wp-settings.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-settings.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** wp-settings.php	22 Oct 2004 18:07:29 -0000	1.60
--- wp-settings.php	26 Oct 2004 04:03:34 -0000	1.61
***************
*** 5,13 ****
  
  // Fix for IIS, which doesn't set REQUEST_URI
! $_SERVER['REQUEST_URI'] = (isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : $_SERVER['SCRIPT_NAME']);
! 
! // Append the query string if it exists and isn't null
! if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
! 	$_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
  }
  
--- 5,15 ----
  
  // Fix for IIS, which doesn't set REQUEST_URI
! if (! isset($_SERVER['REQUEST_URI'])) {
! 	$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];
! 	
! 	// Append the query string if it exists and isn't null
! 	if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
! 		$_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
! 	}
  }