<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15249] trunk/wp-includes: Treat trash/
untrash of posts associated with media items the same as other stati changes
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15249">15249</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-06-14 08:33:48 +0000 (Mon, 14 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Treat trash/untrash of posts associated with media items the same as other stati changes. props koopersmith, see <a href="http://trac.wordpress.org/ticket/13822">#13822</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.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="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (15248 => 15249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2010-06-14 08:25:34 UTC (rev 15248)
+++ trunk/wp-includes/default-filters.php 2010-06-14 08:33:48 UTC (rev 15249)
</span><span class="lines">@@ -231,8 +231,6 @@
</span><span class="cx"> add_action( 'wp_scheduled_delete', 'wp_scheduled_delete' );
</span><span class="cx">
</span><span class="cx"> // Navigation menu actions
</span><del>-add_action( 'trash_post', '_wp_trash_menu_item' );
-add_action( 'untrash_post', '_wp_untrash_menu_item' );
</del><span class="cx"> add_action( 'delete_post', '_wp_delete_post_menu_item' );
</span><span class="cx"> add_action( 'delete_term', '_wp_delete_tax_menu_item' );
</span><span class="cx"> add_action( 'transition_post_status', '_wp_menu_changing_status_observer', 10, 3 );
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (15248 => 15249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2010-06-14 08:25:34 UTC (rev 15248)
+++ trunk/wp-includes/nav-menu.php 2010-06-14 08:33:48 UTC (rev 15249)
</span><span class="lines">@@ -311,9 +311,6 @@
</span><span class="cx"> $original_object = get_post( $args['menu-item-object-id'] );
</span><span class="cx"> $original_parent = (int) $original_object->post_parent;
</span><span class="cx"> $original_title = $original_object->post_title;
</span><del>-
- if ( 'trash' == get_post_status( $args['menu-item-object-id'] ) )
- return new WP_Error('update_nav_menu_item_failed', sprintf(__('The menu item "%1$s" belongs to something that is in the trash, so it cannot be updated.'), $args['menu-item-title'] ) );
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( empty( $args['menu-item-title'] ) || $args['menu-item-title'] == $original_title ) {
</span><span class="lines">@@ -655,48 +652,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Callback for handling a menu item when its original object is trashed.
- *
- * @since 3.0.0
- * @access private
- *
- * @param int $object_id The ID of the original object being trashed.
- *
- */
-function _wp_trash_menu_item( $object_id = 0 ) {
- $object_id = (int) $object_id;
-
- $menu_item_ids = wp_get_associated_nav_menu_items( $object_id );
-
- foreach( (array) $menu_item_ids as $menu_item_id ) {
- $menu_item = get_post( $menu_item_id, ARRAY_A );
- $menu_item['post_status'] = 'pending';
- wp_insert_post($menu_item);
- }
-}
-
-/**
- * Callback for handling a menu item when its original object is un-trashed.
- *
- * @since 3.0.0
- * @access private
- *
- * @param int $object_id The ID of the original object being untrashed.
- *
- */
-function _wp_untrash_menu_item( $object_id = 0 ) {
- $object_id = (int) $object_id;
-
- $menu_item_ids = wp_get_associated_nav_menu_items( $object_id );
-
- foreach( (array) $menu_item_ids as $menu_item_id ) {
- $menu_item = get_post( $menu_item_id, ARRAY_A );
- $menu_item['post_status'] = 'publish';
- wp_insert_post($menu_item);
- }
-}
-
-/**
</del><span class="cx"> * Callback for handling a menu item when its original object is deleted.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="lines">@@ -780,11 +735,10 @@
</span><span class="cx">
</span><span class="cx"> // give menu items draft status if their associated post objects change from "publish" to "draft", or vice versa (draft item being re-published)
</span><span class="cx"> if (
</span><del>- ! empty( $post->ID ) &&
- (
- ( 'publish' == $old_status && 'draft' == $new_status ) ||
- ( 'draft' == $old_status && 'publish' == $new_status )
- )
</del><ins>+ ( $new_status != $old_status ) &&
+ ! empty( $post->ID ) && ! empty( $post->post_type ) &&
+ 'nav_menu_item' != $post->post_type &&
+ ( 'publish' == $old_status || 'publish' == $new_status )
</ins><span class="cx"> ) {
</span><span class="cx"> $menu_items = get_posts(array(
</span><span class="cx"> 'meta_key' => '_menu_item_object_id',
</span><span class="lines">@@ -796,7 +750,7 @@
</span><span class="cx"> foreach( (array) $menu_items as $menu_item ) {
</span><span class="cx"> if ( ! empty( $menu_item->ID ) ) {
</span><span class="cx"> $properties = get_object_vars( $menu_item );
</span><del>- $properties['post_status'] = $new_status;
</del><ins>+ $properties['post_status'] = 'publish' == $new_status ? 'publish' : 'draft';
</ins><span class="cx">
</span><span class="cx"> wp_insert_post( $properties );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>