[wp-cvs] wordpress/wp-includes functions.php,1.132,1.133

[Matthew Mullenweg]

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

Modified Files:
	functions.php 
Log Message:
Whoops!

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** functions.php	23 Jul 2004 09:14:30 -0000	1.132
--- functions.php	23 Jul 2004 09:26:37 -0000	1.133
***************
*** 297,304 ****
  		return $cache_settings->siteurl;
  
! 	if ( isset($cache_settings->$setting) )
  		return $cache_settings->$setting;
! 	else
! 		return @ unserialize( $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'") );
  }
  
--- 297,307 ----
  		return $cache_settings->siteurl;
  
! 	if ( isset($cache_settings->$setting) ) :
  		return $cache_settings->$setting;
! 	else :
! 		$option = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");
! 		if (@ $kellogs =  unserialize($option) ) return $kellogs;
! 		else return $option;
! 	endif;
  }
  
***************
*** 312,316 ****
  			if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
  			if ('category_base' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
! 			@$all_options->{$option->option_name} = unserialize($option->option_value);
  		}
  	}
--- 315,321 ----
  			if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
  			if ('category_base' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
! 		if (@ $value =  unserialize($option->option_value) ) return $value;
! 		else $value = $option->option_value;
! 			$all_options->{$option->option_name} = $value;
  		}
  	}