Changeset 2487

Timestamp:

03/29/2005 05:34:30 AM (22 years ago)

Author:

ryan

Message:

Use private, install/upgrade safe version of get_option() in upgrade-functions.php. Fixes ​http://mosquito.wordpress.org/view.php?id=1165

File:

• trunk/wp-admin/upgrade-functions.php (modified) (8 diffs)

trunk/wp-admin/upgrade-functions.php

@@ -181 +181 @@
     }
 
-        if ( !is_array( get_settings('active_plugins') ) ) {
-                $plugins = explode("\n", trim(get_settings('active_plugins')) );
-                update_option('active_plugins', $plugins);
-        }
+                $active_plugins = __get_option('active_plugins');
+
+                // If plugins are not stored in an array, they're stored in the old
+                // newline separated format.  Convert to new format.
+                if ( !is_array( $active_plugins ) ) {
+                        $active_plugins = explode("\n", trim($active_plugins));
+                        update_option('active_plugins', $active_plugins);
+                }
 
         // Obsolete tables
@@ -290 +294 @@
         }
         return $all_options;
+}
+
+// Version of get_option that is private to install/upgrade.
+function __get_option($setting) {
+        global $wpdb;
+
+        $option = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");
+
+        @ $kellogs = unserialize($option);
+        if ($kellogs !== FALSE)
+                return $kellogs;
+        else
+                return $option;
 }
 
@@ -562 +579 @@
                 if ($lines) {
                         $f = fopen("$site_dir/$newfile", 'w');
-                        
+
+                        $siteurl = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'");
                         foreach ($lines as $line) {
                                 if (preg_match('/require.*wp-blog-header/', $line))
@@ -568 +586 @@
 
                                 // Update stylesheet references.
-                                $line = str_replace("<?php echo get_settings('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line);
+                                $line = str_replace("<?php echo $siteurl; ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line);
 
                                 // Update comments template inclusion.
@@ -580 +598 @@
 
         // Add a theme header.
-        $header = "/*\nTheme Name: $theme_name\nTheme URI: " . get_option('siteurl') . "\nDescription: A theme automatically created by the upgrade.\nVersion: 1.0\nAuthor: Moi\n*/\n";
+        $header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the upgrade.\nVersion: 1.0\nAuthor: Moi\n*/\n";
 
         $stylelines = file_get_contents("$site_dir/style.css");
@@ -619 +637 @@
                 foreach ($stylelines as $line) {
                         if (strstr($line, "Theme Name:")) $line = "Theme Name: $theme_name";
-                        elseif (strstr($line, "Theme URI:")) $line = "Theme URI: " . get_option('siteurl');
+                        elseif (strstr($line, "Theme URI:")) $line = "Theme URI: " . __get_option('siteurl');
                         elseif (strstr($line, "Description:")) $line = "Description: Your theme";
                         elseif (strstr($line, "Version:")) $line = "Version: 1";
@@ -649 +667 @@
 function make_site_theme() {
         // Name the theme after the blog.
-        $theme_name = get_option('blogname');
+        $theme_name = __get_option('blogname');
         $template = sanitize_title($theme_name);
         $site_dir = ABSPATH . "wp-content/themes/$template";
@@ -680 +698 @@
 
         // Make the new site theme active.
-        $current_template = get_option('template');
+        $current_template = __get_option('template');
         if ($current_template == 'default') {
                 update_option('template', $template);