WordPress.org

Make WordPress Core

Ticket #10829: 10829.diff

File 10829.diff, 2.0 KB (added by markjaquith, 9 years ago)
  • wp-includes/version.php

     
    1515 *
    1616 * @global int $wp_db_version
    1717 */
    18 $wp_db_version = 11943;
     18$wp_db_version = 11958;
    1919
    2020/**
    2121 * Holds the TinyMCE version
  • wp-admin/includes/upgrade.php

     
    346346        if ( $wp_current_db_version < 10360 )
    347347                upgrade_280();
    348348
     349        if ( $wp_current_db_version < 11958 )
     350                upgrade_290();
     351
    349352        maybe_disable_automattic_widgets();
    350353
    351354        update_option( 'db_version', $wp_db_version );
     
    983986                populate_roles_280();
    984987}
    985988
     989/**
     990 * Execute changes made in WordPress 2.9.
     991 *
     992 * @since 2.9.0
     993 */
     994function upgrade_290() {
     995        global $wp_current_db_version;
    986996
     997        if ( $wp_current_db_version < 11958 ) {
     998                // Previously, setting depth to 1 would redundantly disable threading, but now 2 is the minimum depth to avoid confusion
     999                if ( get_option( 'thread_comments_depth' ) == '1' ) {
     1000                        update_option( 'thread_comments_depth', 2 );
     1001                        update_option( 'thread_comments', 0 );
     1002                }
     1003        }
     1004}
     1005
     1006
    9871007// The functions we use to actually do stuff
    9881008
    9891009// General
  • wp-admin/options-discussion.php

     
    6666$maxdeep = (int) apply_filters( 'thread_comments_depth_max', 10 );
    6767
    6868$thread_comments_depth = '</label><select name="thread_comments_depth" id="thread_comments_depth">';
    69 for ( $i = 1; $i <= $maxdeep; $i++ ) {
     69for ( $i = 2; $i <= $maxdeep; $i++ ) {
    7070        $thread_comments_depth .= "<option value='" . esc_attr($i) . "'";
    7171        if ( get_option('thread_comments_depth') == $i ) $thread_comments_depth .= " selected='selected'";
    7272        $thread_comments_depth .= ">$i</option>";