Set autoload in populate options query

git-svn-id: http://svn.automattic.com/wordpress/trunk@10768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-03-11 01:07:12 +00:00
parent d10b538652
commit 04a572f4a7
2 changed files with 12 additions and 10 deletions

View File

@ -308,35 +308,37 @@ function populate_options() {
'widget_rss' => array() 'widget_rss' => array()
); );
// Set autoload to no for these options
$fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys' );
$existing_options = $wpdb->get_col("SELECT option_name FROM $wpdb->options"); $existing_options = $wpdb->get_col("SELECT option_name FROM $wpdb->options");
$insert = ''; $insert = '';
foreach ( $options as $option => $value ) { foreach ( $options as $option => $value ) {
if ( in_array($option, $existing_options) ) if ( in_array($option, $existing_options) )
continue; continue;
if ( in_array($option, $fat_options) )
$autoload = 'no';
else
$autoload = 'yes';
$option = $wpdb->escape($option); $option = $wpdb->escape($option);
$value = $wpdb->escape($value); $value = $wpdb->escape($value);
if ( !empty($insert) ) if ( !empty($insert) )
$insert .= ', '; $insert .= ', ';
$insert .= "('$option', '$value')"; $insert .= "('$option', '$value', '$autoload')";
} }
if ( !empty($insert) ) if ( !empty($insert) )
$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value) VALUES " . $insert); $wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
// in case it is set, but blank, update "home" // in case it is set, but blank, update "home"
if ( !__get_option('home') ) update_option('home', $guessurl); if ( !__get_option('home') ) update_option('home', $guessurl);
// Delete unused options // Delete unused options
$unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins', 'can_compress_scripts'); $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins', 'can_compress_scripts');
foreach ($unusedoptions as $option) : foreach ($unusedoptions as $option)
delete_option($option); delete_option($option);
endforeach;
// Set up a few options not to load by default
$fatoptions = array( 'moderation_keys', 'recently_edited', 'blacklist_keys' );
foreach ($fatoptions as $fatoption)
$wpdb->update( $wpdb->options, array('autoload' => 'no'), array('option_name' => $fatoption) );
} }
/** /**

View File

@ -15,6 +15,6 @@ $wp_version = '2.8-bleeding-edge';
* *
* @global int $wp_db_version * @global int $wp_db_version
*/ */
$wp_db_version = 10733; $wp_db_version = 10738;
?> ?>