[wp-cvs] wordpress/wp-admin upgrade-functions.php,1.59,1.60

[Ryan Boren]

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

Modified Files:
	upgrade-functions.php 
Log Message:
Preserve a 1.2 era version of get_alloptions as get_alloptions_110() so that upgrade_110() does not produce db errors due to version 1.3 specific changes to get_alloptions.  http://mosquito.wordpress.org/bug_view_page.php?bug_id=0000037

Index: upgrade-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-functions.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** upgrade-functions.php	11 Jun 2004 18:23:12 -0000	1.59
--- upgrade-functions.php	13 Jun 2004 17:02:44 -0000	1.60
***************
*** 74,77 ****
--- 74,94 ----
  }
  
+ 
+ // get_alloptions as it was for 1.2.
+ function get_alloptions_110() {
+ 	global $wpdb;
+ 	if ($options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options")) {
+ 		foreach ($options as $option) {
+ 			// "When trying to design a foolproof system, 
+ 			//  never underestimate the ingenuity of the fools :)" -- Dougal
+ 			if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
+ 			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} = stripslashes($option->option_value);
+ 		}
+ 	}
+ 	return $all_options;
+ }
+ 
  // .71 stuff
  
***************
*** 732,736 ****
  
  	// Get the GMT offset, we'll use that later on
! 	$all_options = get_alloptions();
  	$time_difference = $all_options->time_difference;
  
--- 749,754 ----
  
  	// Get the GMT offset, we'll use that later on
! 	$all_options = get_alloptions_110();
! 
  	$time_difference = $all_options->time_difference;