WordPress.org

Make WordPress Core

Ticket #12221: 12221.diff

File 12221.diff, 3.2 KB (added by nacin, 8 years ago)

Also needs $wp_db_version bump.

  • wp-admin/includes/schema.php

     
    264264        'uploads_use_yearmonth_folders' => $uploads_use_yearmonth_folders,
    265265        'upload_path' => '',
    266266
    267         // 2.0.3
    268         'secret' => wp_generate_password( 64, true, true ),
    269 
    270267        // 2.1
    271268        'blog_public' => '1',
    272269        'default_link_category' => 2,
     
    356353
    357354        // Delete unused options
    358355        $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',
    359                 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length');
     356                'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length', 'secret');
    360357        foreach ($unusedoptions as $option)
    361358                delete_option($option);
    362359
  • wp-admin/includes/upgrade.php

     
    421421        if ( $wp_current_db_version < 7499 )
    422422                upgrade_250();
    423423
    424         if ( $wp_current_db_version < 7796 )
    425                 upgrade_251();
    426 
    427424        if ( $wp_current_db_version < 7935 )
    428425                upgrade_252();
    429426
     
    10121009}
    10131010
    10141011/**
    1015  * Execute changes made in WordPress 2.5.1.
    1016  *
    1017  * @since 2.5.1
    1018  */
    1019 function upgrade_251() {
    1020         global $wp_current_db_version;
    1021 
    1022         // Make the secret longer
    1023         update_option('secret', wp_generate_password(64));
    1024 }
    1025 
    1026 /**
    10271012 * Execute changes made in WordPress 2.5.2.
    10281013 *
    10291014 * @since 2.5.2
  • wp-includes/pluggable.php

     
    12891289 * @since 2.5
    12901290 * @link https://api.wordpress.org/secret-key/1.1/ Create a Secret Key for wp-config.php
    12911291 *
    1292  * @return string Salt value from either 'SECRET_KEY' or 'secret' option
     1292 * @param string $scheme Authentication scheme
     1293 * @return string Salt value
    12931294 */
    12941295function wp_salt($scheme = 'auth') {
    12951296        global $wp_default_secret_key;