WordPress 4.2.5

[autoinstalls/wordpress.git] / wp-includes / nav-menu.php

diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index 602ad41eacd307f2042f76639927735571fac63d..48549b1aaa4f464713950f8f04dce4923270e04b 100644 (file)
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -441,7 +441,7 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
         *
         * @since 3.0.0
         *
-        * @see wp_update_nav_menu_items()
+        * @see wp_update_nav_menu_item()
         *
         * @param int   $menu_id         ID of the updated menu.
         * @param int   $menu_item_db_id ID of the updated menu item.
@@ -688,7 +688,7 @@ function wp_setup_nav_menu_item( $menu_item ) {
                                $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
 
                        } else {
-                               $menu_item->type_label = __('Custom');
+                               $menu_item->type_label = __('Custom Link');
                                $menu_item->title = $menu_item->post_title;
                                $menu_item->url = empty( $menu_item->url ) ? get_post_meta( $menu_item->ID, '_menu_item_url', true ) : $menu_item->url;
                        }
@@ -806,7 +806,7 @@ function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_
                                'post_type' == $menu_item_type
                        ) {
                                $menu_item_ids[] = (int) $menu_item->ID;
-                       } else if (
+                       } elseif (
                                'taxonomy' == $object_type &&
                                'taxonomy' == $menu_item_type &&
                                get_post_meta( $menu_item->ID, '_menu_item_object', true ) == $taxonomy