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

Remove unused 'secret' option. Fixes #12221 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13309 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-02-22 20:27:02 +00:00
parent 2518cd05bc
commit 2dcfc0913b
4 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/includes/schema.php
View File

@ -265,9 +265,6 @@ function populate_options() {
'uploads_use_yearmonth_folders' => $uploads_use_yearmonth_folders, 'uploads_use_yearmonth_folders' => $uploads_use_yearmonth_folders,
'upload_path' => '', 'upload_path' => '',
// 2.0.3
'secret' => wp_generate_password( 64, true, true ),
// 2.1 // 2.1
'blog_public' => '1', 'blog_public' => '1',
'default_link_category' => 2, 'default_link_category' => 2,
@ -357,7 +354,7 @@ function populate_options() {
// 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',
'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length'); 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length', 'secret');
foreach ($unusedoptions as $option) foreach ($unusedoptions as $option)
delete_option($option); delete_option($option);

15
wp-admin/includes/upgrade.php
View File

@ -421,9 +421,6 @@ function upgrade_all() {
if ( $wp_current_db_version < 7499 ) if ( $wp_current_db_version < 7499 )
upgrade_250(); upgrade_250();
if ( $wp_current_db_version < 7796 )
upgrade_251();
if ( $wp_current_db_version < 7935 ) if ( $wp_current_db_version < 7935 )
upgrade_252(); upgrade_252();
@ -1011,18 +1008,6 @@ function upgrade_250() {
} }
/**
* Execute changes made in WordPress 2.5.1.
*
* @since 2.5.1
*/
function upgrade_251() {
global $wp_current_db_version;
// Make the secret longer
update_option('secret', wp_generate_password(64));
}
/** /**
* Execute changes made in WordPress 2.5.2. * Execute changes made in WordPress 2.5.2.
* *

3
wp-includes/pluggable.php
View File

@ -1288,7 +1288,8 @@ if ( !function_exists('wp_salt') ) :
* @since 2.5 * @since 2.5
* @link https://api.wordpress.org/secret-key/1.1/ Create a Secret Key for wp-config.php * @link https://api.wordpress.org/secret-key/1.1/ Create a Secret Key for wp-config.php
* *
* @return string Salt value from either 'SECRET_KEY' or 'secret' option * @param string $scheme Authentication scheme
* @return string Salt value
*/ */
function wp_salt($scheme = 'auth') { function wp_salt($scheme = 'auth') {
global $wp_default_secret_key; global $wp_default_secret_key;

2
wp-includes/version.php
View File

@ -15,7 +15,7 @@ $wp_version = '3.0-alpha';
* *
* @global int $wp_db_version * @global int $wp_db_version
*/ */
$wp_db_version = 13226; $wp_db_version = 13309;
/** /**
* Holds the TinyMCE version * Holds the TinyMCE version