[wp-cvs] wordpress/wp-includes functions.php,1.128,1.129

[Matthew Mullenweg]

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

Modified Files:
	functions.php 
Log Message:
Fine tune checking.

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** functions.php	30 Jun 2004 15:31:49 -0000	1.128
--- functions.php	30 Jun 2004 21:54:10 -0000	1.129
***************
*** 288,292 ****
  function get_settings($setting) {
  	global $wpdb, $cache_settings;
! 	if ( strstr($_SERVER['REQUEST_URI'], 'install.php') || strstr($_SERVER['REQUEST_URI'], 'upgrade.php') )
  		return false;
  
--- 288,292 ----
  function get_settings($setting) {
  	global $wpdb, $cache_settings;
! 	if ( strstr($_SERVER['REQUEST_URI'], 'wp-admin/install.php') || strstr($_SERVER['REQUEST_URI'], 'wp-admin/upgrade.php') )
  		return false;
  
***************
*** 294,298 ****
  		$cache_settings = get_alloptions();
  
! 	if ('home' == $setting && '' == $cache_settings->home) return $cache_settings->siteurl;
  
  	if ( isset($cache_settings->$setting) )
--- 294,299 ----
  		$cache_settings = get_alloptions();
  
! 	if ('home' == $setting && '' == $cache_settings->home)
! 		return $cache_settings->siteurl;
  
  	if ( isset($cache_settings->$setting) )