<!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>[58854] trunk: Menus: Check if taxonomy term exists in `wp_update_nav_menu_item()`.</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 { white-space: pre-line; 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/58854">58854</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/58854","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-08-05 18:58:49 +0000 (Mon, 05 Aug 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Menus: Check if taxonomy term exists in `wp_update_nav_menu_item()`.
When inserting a term from a non-existing taxonomy as a nav item, the `post_title` property should be empty, and the function should not throw a fatal error for `wp_specialchars_decode()`.
Includes bringing some consistency to similar checks for post types and post type archives in the same code fragment.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/14283">[14283]</a>, <a href="https://core.trac.wordpress.org/changeset/14450">[14450]</a>, <a href="https://core.trac.wordpress.org/changeset/35382">[35382]</a>, <a href="https://core.trac.wordpress.org/changeset/36095">[36095]</a>.
Props dd32, narenin, mukesh27, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/61799">#61799</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunktestsphpunittestspostnavmenuphp">trunk/tests/phpunit/tests/post/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu.php 2024-08-05 10:07:32 UTC (rev 58853)
+++ trunk/src/wp-includes/nav-menu.php 2024-08-05 18:58:49 UTC (rev 58854)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,17 +491,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['menu-item-url'] = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'taxonomy' === $args['menu-item-type'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $original_parent = get_term_field( 'parent', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
- $original_title = get_term_field( 'name', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $original_object = get_term( $args['menu-item-object-id'], $args['menu-item-object'] );
+
+ if ( $original_object instanceof WP_Term ) {
+ $original_parent = get_term_field( 'parent', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
+ $original_title = get_term_field( 'name', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'post_type' === $args['menu-item-type'] ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $original_object = get_post( $args['menu-item-object-id'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $original_object = get_post( $args['menu-item-object-id'] );
- $original_parent = (int) $original_object->post_parent;
- $original_title = $original_object->post_title;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $original_object instanceof WP_Post ) {
+ $original_parent = (int) $original_object->post_parent;
+ $original_title = $original_object->post_title;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'post_type_archive' === $args['menu-item-type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_object = get_post_type_object( $args['menu-item-object'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $original_object ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $original_object instanceof WP_Post_Type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_title = $original_object->labels->archives;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestspostnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/nav-menu.php 2024-08-05 10:07:32 UTC (rev 58853)
+++ trunk/tests/phpunit/tests/post/nav-menu.php 2024-08-05 18:58:49 UTC (rev 58854)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1209,6 +1209,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests `wp_update_nav_menu_item()` with a non-existing taxonomy.
+ *
+ * When inserting a term from a non-existing taxonomy as a nav item,
+ * the `post_title` property should be empty, and the function
+ * should not throw a fatal error for `wp_specialchars_decode()`.
+ *
+ * @ticket 61799
+ */
+ public function test_wp_update_nav_menu_item_with_invalid_taxonomy() {
+ register_taxonomy( 'invalid', 'post' );
+ $term = self::factory()->term->create_and_get( array( 'taxonomy' => 'invalid' ) );
+ unregister_taxonomy( 'invalid' );
+
+ $menu_item_id = wp_update_nav_menu_item(
+ $this->menu_id,
+ 0,
+ array(
+ 'menu-item-type' => 'taxonomy',
+ 'menu-item-object' => 'invalid',
+ 'menu-item-object-id' => $term->term_id,
+ 'menu-item-status' => 'publish',
+ )
+ );
+
+ $menu_item = get_post( $menu_item_id );
+ $this->assertEmpty( $menu_item->post_title );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Test passed post_date/post_date_gmt.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * When inserting a nav menu item, it should be possible to set the post_date
</span></span></pre>
</div>
</div>
</body>
</html>