From 9539dda214e02cca6f136580950ff6720ff0c75e Mon Sep 17 00:00:00 2001 From: Konstantin Obenland Date: Thu, 24 Dec 2015 00:26:22 +0000 Subject: [PATCH] Menus: Bring back line break between menu items. While removing line breaks was great for all use cases except justified menu items, it broke menus with justified menu items. Reverts [34321]. Merges [36081] to the 4.4 branch. Props wp-architect. Fixes #35107. Built from https://develop.svn.wordpress.org/branches/4.4@36082 git-svn-id: http://core.svn.wordpress.org/branches/4.4@36047 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/nav-menu-template.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php index 253b6547cd..e947eb8571 100644 --- a/wp-includes/nav-menu-template.php +++ b/wp-includes/nav-menu-template.php @@ -211,7 +211,7 @@ class Walker_Nav_Menu extends Walker { * @param array $args An array of arguments. @see wp_nav_menu() */ public function end_el( &$output, $item, $depth = 0, $args = array() ) { - $output .= ''; + $output .= "\n"; } } // Walker_Nav_Menu diff --git a/wp-includes/version.php b/wp-includes/version.php index 94a7d6ee4f..6a2c77968f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4.1-alpha-36067'; +$wp_version = '4.4.1-alpha-36082'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.