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

[Ryan Boren]

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

Modified Files:
	wp-settings.php 
Log Message:
Fix REQUEST_URI construction for IIS.  Bug 389.  Patch from Dennis Williamson.

Index: wp-settings.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-settings.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** wp-settings.php	14 Oct 2004 07:26:41 -0000	1.59
--- wp-settings.php	22 Oct 2004 18:07:29 -0000	1.60
***************
*** 5,9 ****
  
  // Fix for IIS, which doesn't set REQUEST_URI
! $_SERVER['REQUEST_URI'] = ( isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : $_SERVER['SCRIPT_NAME'] . (( isset($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '')));
  
  if ( !(phpversion() >= '4.1') )
--- 5,14 ----
  
  // 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'];
! }
  
  if ( !(phpversion() >= '4.1') )