Changeset 24235

Timestamp:

05/10/2013 06:03:09 PM (12 years ago)

Author:

SergeyBiryukov

Message:

Prevent menu items with '0' label from being removed on menu saving. props MikeHansenMe, kovshenin. fixes #23051.

Location:

trunk

Files:

• wp-admin/includes/nav-menu.php (modified) (2 diffs)
• wp-includes/nav-menu.php (modified) (1 diff)

trunk/wp-admin/includes/nav-menu.php

@@ -80 +80 @@
         }
 
-        $title = empty( $item->label ) ? $title : $item->label;
+        $title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label;
 
         $submenu_text = '';
@@ -1236 +1236 @@
 
             // Menu item title can't be blank
-            if ( empty( $_POST['menu-item-title'][$_key] ) )
+            if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
                 continue;
 

trunk/wp-includes/nav-menu.php

@@ -337 +337 @@
         }
 
-        if ( empty( $args['menu-item-title'] ) || $args['menu-item-title'] == $original_title ) {
+        if ( $args['menu-item-title'] == $original_title )
             $args['menu-item-title'] = '';
 
-            // hack to get wp to create a post object when too many properties are empty
-            if ( empty( $args['menu-item-description'] ) )
-                $args['menu-item-description'] = ' ';
-        }
+        // hack to get wp to create a post object when too many properties are empty
+        if ( '' ==  $args['menu-item-title'] && '' == $args['menu-item-description'] )
+            $args['menu-item-description'] = ' ';
     }