diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 237d07a520..3f8beab86b 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -1204,7 +1204,16 @@ function wp_list_pages( $args = '' ) { * @return string|void HTML menu */ function wp_page_menu( $args = array() ) { - $defaults = array('sort_column' => 'menu_order, 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' => '', + 'before' => '', + 'walker' => '' + ); $args = wp_parse_args( $args, $defaults ); /** @@ -1247,9 +1256,9 @@ function wp_page_menu( $args = array() ) { $list_args['title_li'] = ''; $menu .= str_replace( array( "\r", "\n", "\t" ), '', wp_list_pages($list_args) ); - if ( $menu ) - $menu = ''; - + if ( $menu ) { + $menu = $args['before'] . $menu . $args['after']; + } $menu = '
' . $menu . "
\n"; /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 8deae33f50..19541c9e71 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34188'; +$wp_version = '4.4-alpha-34200'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.