Changeset 18426

Timestamp:

07/11/2011 07:03:04 PM (13 years ago)

Author:

nacin

Message:

Check for WP_Error return values when using get_term_field() to set up nav menu items. fixes #17958 for trunk.

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

@@ -55 +55 @@
         if ( 'taxonomy' == $item->type ) {
             $original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
+            if ( is_wp_error( $original_title ) )
+                $original_title = false;
         } elseif ( 'post_type' == $item->type ) {
             $original_object = get_post( $item->object_id );
@@ -172 +174 @@
 
                 <div class="menu-item-actions description-wide submitbox">
-                    <?php if( 'custom' != $item->type ) : ?>
+                    <?php if( 'custom' != $item->type && $original_title !== false ) : ?>
                         <p class="link-to-original">
                             <?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>

trunk/wp-includes/nav-menu.php

@@ -606 +606 @@
 
                 $original_title = get_term_field( 'name', $menu_item->object_id, $menu_item->object, 'raw' );
+                if ( is_wp_error( $original_title ) )
+                    $original_title = false;
                 $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;