[wp-cvs] wordpress/wp-includes functions.php,1.216,1.217

[Ryan Boren]

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

Modified Files:
	functions.php 
Log Message:
Unserialize empty arrays.

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.216
retrieving revision 1.217
diff -C2 -d -r1.216 -r1.217
*** functions.php	28 Nov 2004 05:24:09 -0000	1.216
--- functions.php	28 Nov 2004 19:53:11 -0000	1.217
***************
*** 349,354 ****
  			return false;
  		endif;
! 	  
! 		if (@ $kellogs =  unserialize($option) ) return $kellogs;
  		else return $option;
  	endif;
--- 349,356 ----
  			return false;
  		endif;
! 
! 		@ $kellogs = unserialize($option);
! 		if ($kellogs !== FALSE)
! 			return $kellogs;
  		else return $option;
  	endif;
***************
*** 379,385 ****
  		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) )
! 		$all_options->{$option->option_name} = $value;
! 	else $value = $option->option_value;
  		$all_options->{$option->option_name} = $value;
  	}
--- 381,387 ----
  		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);
! 		@ $value = unserialize($option->option_value);
! 		if ($value === FALSE)
! 			$value = $option->option_value;
  		$all_options->{$option->option_name} = $value;
  	}