Wordpress 3.2.1

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

diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
index f3e2af08be97cf6fec060b716bf4faf7d0c8b6b0..889016627baaba2320a287b47f3fbe0034a51246 100644 (file)
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -54,6 +54,8 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu  {
                $original_title = '';
                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 );
                        $original_title = $original_object->post_title;
@@ -171,7 +173,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu  {
                                </p>
 
                                <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>' ); ?>
                                                </p>