[wp-cvs] wordpress wp-login.php,1.55,1.56

[Matthew Mullenweg]

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

Modified Files:
	wp-login.php 
Log Message:
Siteurl autoupdate now requires RELOCATE flag - http://mosquito.wordpress.org/view.php?id=602

Index: wp-login.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** wp-login.php	20 Jan 2005 23:44:57 -0000	1.55
--- wp-login.php	24 Jan 2005 07:30:49 -0000	1.56
***************
*** 10,19 ****
  header('Pragma: no-cache');
  
! // If someone has moved WordPress let's try to detect it
! if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
! 	$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
! 
! if ( dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') )
! 	update_option('siteurl', dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
  
  switch($action) {
--- 10,20 ----
  header('Pragma: no-cache');
  
! if ( defined('RELOCATE') ) { // Move flag is set
! 	if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
! 		$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
! 	
! 	if ( dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') )
! 		update_option('siteurl', dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
! }
  
  switch($action) {