Changeset 9246

Timestamp:

10/18/2008 09:15:20 PM (16 years ago)

Author:

ryan

Message:

wp_page_menu() echo fixes. see #7914

File:

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

trunk/wp-includes/post-template.php

@@ -665 +665 @@
         if ( is_home() && !is_paged() )
             $class = 'class="current_page_item"';
-        $menu = '<li ' . $class . '><a href="' . get_option('home') . '">' . $text . '</a></li>';
-    }
-
-    $menu .= str_replace( array( "\r", "\n", "\t" ), '', wp_list_pages($args) );
+        $menu .= '<li ' . $class . '><a href="' . get_option('home') . '">' . $text . '</a></li>';
+    }
+
+    $list_args = $args;
+    $list_args['echo'] = false;
+    $list_args['title_li'] = '';
+    $menu .= str_replace( array( "\r", "\n", "\t" ), '', wp_list_pages($list_args) );
 
     if ( $menu )
@@ -674 +677 @@
 
     $menu = '<div id="' . $args['menu_class'] . '">' . $menu . "</div>\n";
-    $menu = apply_filters( 'wp_page_menu', $menu ); 
+    $menu = apply_filters( 'wp_page_menu', $menu, $args ); 
     if ( $args['echo'] )
         echo $menu;