From 5f1c87f2717268aa1fb92504d8954cb24695b8ac Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 21 Nov 2014 05:56:23 +0000
Subject: [PATCH] Set min-height for menu item title. Add a fallback for
 empty-titled items.

props philiparthurmoore.
fixes #30283.

git-svn-id: https://develop.svn.wordpress.org/trunk@30500 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/nav-menus.css | 1 +
 src/wp-includes/nav-menu.php   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/wp-admin/css/nav-menus.css b/src/wp-admin/css/nav-menus.css
index 28e32b8024..dd67f45851 100644
--- a/src/wp-admin/css/nav-menus.css
+++ b/src/wp-admin/css/nav-menus.css
@@ -471,6 +471,7 @@ ul.add-menu-item-tabs li {
 	position: relative;
 	padding: 10px 15px;
 	height: auto;
+	min-height: 20px;
 	width: 382px;
 	line-height: 30px;
 	overflow: hidden;
diff --git a/src/wp-includes/nav-menu.php b/src/wp-includes/nav-menu.php
index a72f2c9586..62875e47cc 100644
--- a/src/wp-includes/nav-menu.php
+++ b/src/wp-includes/nav-menu.php
@@ -661,6 +661,11 @@ function wp_setup_nav_menu_item( $menu_item ) {
 
 				$original_object = get_post( $menu_item->object_id );
 				$original_title = $original_object->post_title;
+
+				if ( '' === $original_title ) {
+					$original_title = sprintf( __( '#%d (no title)' ), $original_object->ID );
+				}
+
 				$menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
 
 			} elseif ( 'taxonomy' == $menu_item->type ) {