Index: C:/xampp/htdocs/wordpress_trunk/wp-includes/comment-template.php =================================================================== --- C:/xampp/htdocs/wordpress_trunk/wp-includes/comment-template.php (revision 10487) +++ C:/xampp/htdocs/wordpress_trunk/wp-includes/comment-template.php (working copy) @@ -834,7 +834,7 @@ $overridden_cpage = FALSE; if ( '' == get_query_var('cpage') && get_option('page_comments') ) { - set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 ); + set_query_var( 'cpage', 'desc' == get_option('comment_order') ? get_comment_pages_count() : 1 ); $overridden_cpage = TRUE; } @@ -1285,7 +1285,7 @@ $comment_depth = 1; $defaults = array('walker' => null, 'max_depth' => '', 'style' => 'ul', 'callback' => null, 'end-callback' => null, 'type' => 'all', - 'page' => '', 'per_page' => '', 'avatar_size' => 32, 'reverse_top_level' => null, 'reverse_children' => ''); + 'page' => '', 'per_page' => '', 'avatar_size' => 32, 'reverse_top_level' => null); $r = wp_parse_args( $args, $defaults ); @@ -1336,7 +1336,7 @@ $r['page'] = get_query_var('cpage'); } else { $threaded = ( -1 == $r['max_depth'] ) ? false : true; - $r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1; + $r['page'] = ( 'desc' == get_option('comment_order') ) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1; set_query_var( 'cpage', $r['page'] ); } } Index: C:/xampp/htdocs/wordpress_trunk/wp-includes/link-template.php =================================================================== --- C:/xampp/htdocs/wordpress_trunk/wp-includes/link-template.php (revision 10487) +++ C:/xampp/htdocs/wordpress_trunk/wp-includes/link-template.php (working copy) @@ -1223,7 +1223,7 @@ $result = get_permalink( $post->ID ); - if ( 'newest' == get_option('default_comments_page') ) { + if ( 'desc' == get_option('comment_order') ) { if ( $pagenum != $max_page ) { if ( $wp_rewrite->using_permalinks() ) $result = user_trailingslashit( trailingslashit($result) . 'comment-page-' . $pagenum, 'commentpaged'); Index: C:/xampp/htdocs/wordpress_trunk/wp-includes/canonical.php =================================================================== --- C:/xampp/htdocs/wordpress_trunk/wp-includes/canonical.php (revision 10487) +++ C:/xampp/htdocs/wordpress_trunk/wp-includes/canonical.php (working copy) @@ -163,7 +163,7 @@ } } - if ( get_option('page_comments') && ( ( 'newest' == get_option('default_comments_page') && get_query_var('cpage') > 0 ) || ( 'newest' != get_option('default_comments_page') && get_query_var('cpage') > 1 ) ) ) { + if ( get_option('page_comments') && ( ( 'desc' == get_option('comment_order') && get_query_var('cpage') > 0 ) || ( 'desc' != get_option('comment_order') && get_query_var('cpage') > 1 ) ) ) { $addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit( 'comment-page-' . get_query_var('cpage'), 'commentpaged' ); $redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] ); } Index: C:/xampp/htdocs/wordpress_trunk/wp-includes/classes.php =================================================================== --- C:/xampp/htdocs/wordpress_trunk/wp-includes/classes.php (revision 10487) +++ C:/xampp/htdocs/wordpress_trunk/wp-includes/classes.php (working copy) @@ -952,7 +952,7 @@ * * @package WordPress * @since 2.7 - * @param $max_depth = 0 means display all levels; $max_depth > 0 specifies the number of display levels. + * @param $max_depth = -1 means flat display; $max_depth = 0 means display all levels; $max_depth > 0 specifies the number of display levels. * @param $page_num the specific page number, beginning with 1. * @return XHTML of the specified page of elements */ @@ -1028,12 +1028,12 @@ $end = $total_top; if ( !empty($args[0]['reverse_top_level']) ) { + $top_level_elements = array_reverse( $top_level_elements ); $oldstart = $start; $start = $total_top - $end; $end = $total_top - $oldstart; - } - if ( !empty($args[0]['reverse_children']) ) { + foreach ( $children_elements as $parent => $children ) $children_elements[$parent] = array_reverse( $children ); } Index: C:/xampp/htdocs/wordpress_trunk/wp-admin/includes/schema.php =================================================================== --- C:/xampp/htdocs/wordpress_trunk/wp-admin/includes/schema.php (revision 10487) +++ C:/xampp/htdocs/wordpress_trunk/wp-admin/includes/schema.php (working copy) @@ -292,7 +292,6 @@ add_option('thread_comments_depth', 5); add_option('page_comments', 1); add_option('comments_per_page', 50); - add_option('default_comments_page', 'newest'); add_option('comment_order', 'asc'); add_option('use_ssl', 0); add_option('sticky_posts', array()); Index: C:/xampp/htdocs/wordpress_trunk/wp-admin/options-discussion.php =================================================================== --- C:/xampp/htdocs/wordpress_trunk/wp-admin/options-discussion.php (revision 10487) +++ C:/xampp/htdocs/wordpress_trunk/wp-admin/options-discussion.php (working copy) @@ -77,27 +77,17 @@ /> -
- +
+ Index: C:/xampp/htdocs/wordpress_trunk/wp-admin/options.php =================================================================== --- C:/xampp/htdocs/wordpress_trunk/wp-admin/options.php (revision 10487) +++ C:/xampp/htdocs/wordpress_trunk/wp-admin/options.php (working copy) @@ -23,7 +23,7 @@ $whitelist_options = array( 'general' => array( 'blogname', 'blogdescription', 'admin_email', 'users_can_register', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'default_role' ), - 'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ), + 'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'comment_order', 'comment_registration' ), 'misc' => array( 'hack_file', 'use_linksupdate', 'uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path' ), 'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ), 'privacy' => array( 'blog_public' ),