WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@2487 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2005-03-29 05:34:30 +00:00
parent 171fa8fabd
commit c48ebdadd7
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
wp-admin/upgrade-functions.php
View File

@ -180,10 +180,14 @@ function upgrade_130() {
$wpdb->query("UPDATE $wpdb->options SET option_value = 'posts' WHERE option_name = 'what_to_show'"); $wpdb->query("UPDATE $wpdb->options SET option_value = 'posts' WHERE option_name = 'what_to_show'");
} }
if ( !is_array( get_settings('active_plugins') ) ) { $active_plugins = __get_option('active_plugins');
$plugins = explode("\n", trim(get_settings('active_plugins')) );
update_option('active_plugins', $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 // Obsolete tables
$wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optionvalues'); $wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optionvalues');
@ -291,6 +295,19 @@ function get_alloptions_110() {
return $all_options; 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;
}
function deslash($content) { function deslash($content) {
// Note: \\\ inside a regex denotes a single backslash. // Note: \\\ inside a regex denotes a single backslash.
@ -561,13 +578,14 @@ function make_site_theme_from_oldschool($theme_name, $template) {
$lines = explode("\n", implode('', file("$site_dir/$newfile"))); $lines = explode("\n", implode('', file("$site_dir/$newfile")));
if ($lines) { if ($lines) {
$f = fopen("$site_dir/$newfile", 'w'); $f = fopen("$site_dir/$newfile", 'w');
$siteurl = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'");
foreach ($lines as $line) { foreach ($lines as $line) {
if (preg_match('/require.*wp-blog-header/', $line)) if (preg_match('/require.*wp-blog-header/', $line))
$line = '//' . $line; $line = '//' . $line;
// Update stylesheet references. // 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. // Update comments template inclusion.
$line = str_replace("<?php include(ABSPATH . 'wp-comments.php'); ?>", "<?php comments_template(); ?>", $line); $line = str_replace("<?php include(ABSPATH . 'wp-comments.php'); ?>", "<?php comments_template(); ?>", $line);
@ -579,7 +597,7 @@ function make_site_theme_from_oldschool($theme_name, $template) {
} }
// Add a theme header. // 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"); $stylelines = file_get_contents("$site_dir/style.css");
if ($stylelines) { if ($stylelines) {
@ -618,7 +636,7 @@ function make_site_theme_from_default($theme_name, $template) {
foreach ($stylelines as $line) { foreach ($stylelines as $line) {
if (strstr($line, "Theme Name:")) $line = "Theme Name: $theme_name"; 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, "Description:")) $line = "Description: Your theme";
elseif (strstr($line, "Version:")) $line = "Version: 1"; elseif (strstr($line, "Version:")) $line = "Version: 1";
elseif (strstr($line, "Author:")) $line = "Author: You"; elseif (strstr($line, "Author:")) $line = "Author: You";
@ -648,7 +666,7 @@ function make_site_theme_from_default($theme_name, $template) {
// Create a site theme from the default theme. // Create a site theme from the default theme.
function make_site_theme() { function make_site_theme() {
// Name the theme after the blog. // Name the theme after the blog.
$theme_name = get_option('blogname'); $theme_name = __get_option('blogname');
$template = sanitize_title($theme_name); $template = sanitize_title($theme_name);
$site_dir = ABSPATH . "wp-content/themes/$template"; $site_dir = ABSPATH . "wp-content/themes/$template";
@ -679,7 +697,7 @@ function make_site_theme() {
} }
// Make the new site theme active. // Make the new site theme active.
$current_template = get_option('template'); $current_template = __get_option('template');
if ($current_template == 'default') { if ($current_template == 'default') {
update_option('template', $template); update_option('template', $template);
update_option('stylesheet', $template); update_option('stylesheet', $template);