From a155c5dcfd827f2e0e2fb941fb529bcb7085d6e7 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Sun, 27 Sep 2015 23:38:32 +0000
Subject: [PATCH] After [34200], force 'before' and 'after' to `<ul>` and
 `</ul>` when `wp_nav_menu()` falls back to `wp_page_menu()`.

See #11095.


git-svn-id: https://develop.svn.wordpress.org/trunk@34653 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/post-template.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/post-template.php b/src/wp-includes/post-template.php
index 99deacc22b..a16f123074 100644
--- a/src/wp-includes/post-template.php
+++ b/src/wp-includes/post-template.php
@@ -1264,10 +1264,21 @@ function wp_page_menu( $args = array() ) {
 	$list_args['title_li'] = '';
 	$menu .= str_replace( array( "\r", "\n", "\t" ), '', wp_list_pages($list_args) );
 
+	$container = sanitize_text_field( $args['container'] );
+
 	if ( $menu ) {
+
+		// wp_nav_menu doesn't set before and after
+		if ( isset( $args['fallback_cb'] ) &&
+			'wp_page_menu' === $args['fallback_cb'] &&
+			'ul' !== $container ) {
+			$args['before'] = '<ul>';
+			$args['after'] = '</ul>';
+		}
+
 		$menu = $args['before'] . $menu . $args['after'];
 	}
-	$container = sanitize_text_field( $args['container'] );
+
 	$attrs = '';
 	if ( ! empty( $args['menu_id'] ) ) {
 		$attrs .= ' id="' . esc_attr( $args['menu_id'] ) . '"';