From bd114445efc80ca5b805902455f52d5f4890b4a7 Mon Sep 17 00:00:00 2001 From: rboren Date: Sun, 13 Jun 2004 17:02:44 +0000 Subject: [PATCH] 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 git-svn-id: http://svn.automattic.com/wordpress/trunk@1421 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/upgrade-functions.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php index d744ee1ea..8b29ec4ec 100644 --- a/wp-admin/upgrade-functions.php +++ b/wp-admin/upgrade-functions.php @@ -73,6 +73,23 @@ function maybe_add_column($table_name, $column_name, $create_ddl) { return false; } + +// 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 function upgrade_071() { @@ -731,7 +748,8 @@ function upgrade_110() { } // Get the GMT offset, we'll use that later on - $all_options = get_alloptions(); + $all_options = get_alloptions_110(); + $time_difference = $all_options->time_difference; $server_time = time()+date('Z');