Changes from trunk/wp-includes/post-template.php at r11450 to branches/2.8/wp-includes/post-template.php at r11643

File:

• branches/2.8/wp-includes/post-template.php (modified) (2 diffs)

branches/2.8/wp-includes/post-template.php

@@ -431 +431 @@
             $classes[] = 'page-parent';
 
-        if ( $wp_query->post->post_parent )
+        if ( $wp_query->post->post_parent ) {
             $classes[] = 'page-child';
             $classes[] = 'parent-pageid-' . $wp_query->post->post_parent;
-
-        if ( is_page_template() )
+        }
+        if ( is_page_template() ) {
             $classes[] = 'page-template';
             $classes[] = 'page-template-' . str_replace( '.php', '-php', get_post_meta( $pageID, '_wp_page_template', true ) );
+        }
     } elseif ( is_search() ) {
         if ( !empty($wp_query->posts) )
@@ -806 +807 @@
  */
 function wp_page_menu( $args = array() ) {
-    $defaults = array('sort_column' => 'post_title', 'menu_class' => 'menu', 'echo' => true, 'link_before' => '', 'link_after' => '');
+    $defaults = array('sort_column' => 'menu_order, post_title', 'menu_class' => 'menu', 'echo' => true, 'link_before' => '', 'link_after' => '');
     $args = wp_parse_args( $args, $defaults );
     $args = apply_filters( 'wp_page_menu_args', $args );