Changeset 13309

Timestamp:

02/22/2010 08:27:02 PM (15 years ago)

Author:

nacin

Message:

Remove unused 'secret' option. Fixes #12221

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (2 diffs)
• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -266 +266 @@
     'upload_path' => '',
 
-    // 2.0.3
-    'secret' => wp_generate_password( 64, true, true ),
-
     // 2.1
     'blog_public' => '1',
@@ -358 +355 @@
     // 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',
-        '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)
         delete_option($option);

trunk/wp-admin/includes/upgrade.php

@@ -422 +422 @@
         upgrade_250();
 
-    if ( $wp_current_db_version < 7796 )
-        upgrade_251();
-
     if ( $wp_current_db_version < 7935 )
         upgrade_252();
@@ -1010 +1007 @@
     }
 
-}
-
-/**
- * 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));
 }
 

trunk/wp-includes/pluggable.php

@@ -1289 +1289 @@
  * @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') {

trunk/wp-includes/version.php

@@ -16 +16 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 13226;
+$wp_db_version = 13309;
 
 /**