<!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>[54973] trunk/src: Menus: Reset `menu_item_parent` to 0 when the parent is set to the item itself.</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/54973">54973</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/54973","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-12-14 22:52:11 +0000 (Wed, 14 Dec 2022)</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: Reset `menu_item_parent` to 0 when the parent is set to the item itself.
Props: peterwilsoncc, SergeyBiryukov, azaozz.
Fixes <a href="https://core.trac.wordpress.org/ticket/57169">#57169</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
<li><a href="#trunksrcwpincludesnavmenutemplatephp">trunk/src/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminnavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/nav-menus.php 2022-12-14 14:29:55 UTC (rev 54972)
+++ trunk/src/wp-admin/nav-menus.php 2022-12-14 22:52:11 UTC (rev 54973)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,6 +117,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $parent_object ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_data = (array) $parent_object;
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Reset invalid `menu_item_parent`.
+ $menu_item_data = _wp_reset_invalid_menu_item_parent( $menu_item_data );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,6 +130,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_data['menu_order'] = $menu_item_data['menu_order'] + 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_data['menu_item_parent'] = $next_item_data['ID'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Reset invalid `menu_item_parent`.
+ $menu_item_data = _wp_reset_invalid_menu_item_parent( $menu_item_data );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( $menu_item_data );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,6 +145,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> && in_array( (int) $menu_item_data['menu_item_parent'], $orders_to_dbids, true )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_data['menu_item_parent'] = (int) get_post_meta( $menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Reset invalid `menu_item_parent`.
+ $menu_item_data = _wp_reset_invalid_menu_item_parent( $menu_item_data );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,6 +259,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Just make it a child of the previous; keep the order.
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Reset invalid `menu_item_parent`.
+ $menu_item_data = _wp_reset_invalid_menu_item_parent( $menu_item_data );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( $menu_item_data );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenutemplatephp"></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-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu-template.php 2022-12-14 14:29:55 UTC (rev 54972)
+++ trunk/src/wp-includes/nav-menu-template.php 2022-12-14 22:52:11 UTC (rev 54973)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,6 +199,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items_tree = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items_with_children = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $menu_items as $menu_item ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Fix invalid `menu_item_parent`. See: https://core.trac.wordpress.org/ticket/56926.
+ if ( (int) $menu_item->ID === (int) $menu_item->menu_item_parent ) {
+ $menu_item->menu_item_parent = 0;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items_tree[ $menu_item->ID ] = $menu_item->menu_item_parent;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $menu_item->menu_item_parent ) {
</span></span></pre></div>
<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 2022-12-14 14:29:55 UTC (rev 54972)
+++ trunk/src/wp-includes/nav-menu.php 2022-12-14 22:52:11 UTC (rev 54973)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -563,6 +563,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_db_id = (int) $menu_item_db_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reset invalid `menu_item_parent`.
+ if ( (int) $args['menu-item-parent-id'] === $menu_item_db_id ) {
+ $args['menu-item-parent-id'] = 0;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_db_id, '_menu_item_type', sanitize_key( $args['menu-item-type'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_db_id, '_menu_item_menu_item_parent', (string) ( (int) $args['menu-item-parent-id'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_db_id, '_menu_item_object_id', (string) ( (int) $args['menu-item-object-id'] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1273,3 +1278,31 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $new_nav_menu_locations;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Prevents menu items from being their own parent.
+ *
+ * Resets menu_item_parent to 0 when the parent is set to the item itself.
+ * For use before saving `_menu_item_menu_item_parent` in nav-menus.php.
+ *
+ * @since 6.1.2
+ * @access private
+ *
+ * @param array $menu_item_data The menu item data array.
+ * @return array The menu item data with reset menu_item_parent.
+ */
+function _wp_reset_invalid_menu_item_parent( $menu_item_data ) {
+ if ( ! is_array( $menu_item_data ) ) {
+ return $menu_item_data;
+ }
+
+ if (
+ ! empty( $menu_item_data['ID'] ) &&
+ ! empty( $menu_item_data['menu_item_parent'] ) &&
+ (int) $menu_item_data['ID'] === (int) $menu_item_data['menu_item_parent']
+ ) {
+ $menu_item_data['menu_item_parent'] = 0;
+ }
+
+ return $menu_item_data;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>