<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[18426] trunk: Check for WP_Error return values when using get_term_field() to set up nav menu items.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/18426">18426</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-07-11 19:03:04 +0000 (Mon, 11 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check for WP_Error return values when using get_term_field() to set up nav menu items. fixes <a href="http://trac.wordpress.org/ticket/17958">#17958</a> for trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpincludesnavmenuphp">trunk/wp-includes/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (18425 => 18426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2011-07-11 18:56:15 UTC (rev 18425)
+++ trunk/wp-admin/includes/nav-menu.php 2011-07-11 19:03:04 UTC (rev 18426)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx"> $original_title = '';
</span><span class="cx"> if ( 'taxonomy' == $item->type ) {
</span><span class="cx"> $original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
</span><ins>+ if ( is_wp_error( $original_title ) )
+ $original_title = false;
</ins><span class="cx"> } elseif ( 'post_type' == $item->type ) {
</span><span class="cx"> $original_object = get_post( $item->object_id );
</span><span class="cx"> $original_title = $original_object->post_title;
</span><span class="lines">@@ -171,7 +173,7 @@
</span><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <div class="menu-item-actions description-wide submitbox">
</span><del>- <?php if( 'custom' != $item->type ) : ?>
</del><ins>+ <?php if( 'custom' != $item->type && $original_title !== false ) : ?>
</ins><span class="cx"> <p class="link-to-original">
</span><span class="cx"> <?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
</span><span class="cx"> </p>
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (18425 => 18426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2011-07-11 18:56:15 UTC (rev 18425)
+++ trunk/wp-includes/nav-menu.php 2011-07-11 19:03:04 UTC (rev 18426)
</span><span class="lines">@@ -605,6 +605,8 @@
</span><span class="cx"> $menu_item->url = !is_wp_error( $term_url ) ? $term_url : '';
</span><span class="cx">
</span><span class="cx"> $original_title = get_term_field( 'name', $menu_item->object_id, $menu_item->object, 'raw' );
</span><ins>+ if ( is_wp_error( $original_title ) )
+ $original_title = false;
</ins><span class="cx"> $menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
</span><span class="cx">
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>