Changeset 10115 for trunk/wp-includes/post-template.php

Timestamp:

12/07/2008 12:14:14 PM (16 years ago)

Author:

westi

Message:

Make wp_page_menu() respect is_front_page(). Fixes #8469 props AaronCampbell.

File:

• trunk/wp-includes/post-template.php (modified) (3 diffs)

trunk/wp-includes/post-template.php

@@ -450 +450 @@
                             $output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">';
                     }
-                    
+
                 }
                 $output .= $link_before;
@@ -670 +670 @@
     $menu = '';
 
+    $list_args = $args;
+
     // Show Home in the menu
     if ( isset($args['show_home']) && ! empty($args['show_home']) ) {
@@ -677 +679 @@
             $text = $args['show_home'];
         $class = '';
-        if ( is_home() && !is_paged() )
+        if ( is_front_page() && !is_paged() )
             $class = 'class="current_page_item"';
         $menu .= '<li ' . $class . '><a href="' . get_option('home') . '">' . $link_before . $text . $link_after . '</a></li>';
-    }
-
-    $list_args = $args;
+        // If the front page is a page, add it to the exclude list
+        if (get_option('show_on_front') == 'page') {
+            if ( !empty( $list_args['exclude'] ) ) {
+                $list_args['exclude'] .= ',';
+            } else {
+                $list_args['exclude'] = '';
+            }
+            $list_args['exclude'] = get_option('page_on_front');
+        }
+    }
+
     $list_args['echo'] = false;
     $list_args['title_li'] = '';