<!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>[12290] trunk: "Trash" fixes, props caesarsgrunt, see #4529</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12290">12290</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-11-28 03:56:20 +0000 (Sat, 28 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>"Trash" fixes, props caesarsgrunt, see <a href="http://trac.wordpress.org/ticket/4529">#4529</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (12289 => 12290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2009-11-28 02:56:15 UTC (rev 12289)
+++ trunk/wp-admin/upload.php 2009-11-28 03:56:20 UTC (rev 12290)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> $messages[1] = __('Media attachment updated.');
</span><span class="cx"> $messages[2] = __('Media permanently deleted.');
</span><span class="cx"> $messages[3] = __('Error saving media attachment.');
</span><del>-$messages[4] = __('Media moved to the trash.') . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.$_GET['ids'], "bulk-media" ) ) . '">' . __('Undo?') . '</a>';
</del><ins>+$messages[4] = __('Media moved to the trash.') . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __('Undo?') . '</a>';
</ins><span class="cx"> $messages[5] = __('Media restored from the trash.');
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['message']) && (int) $_GET['message'] ) {
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (12289 => 12290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2009-11-28 02:56:15 UTC (rev 12289)
+++ trunk/wp-includes/comment.php 2009-11-28 03:56:20 UTC (rev 12290)
</span><span class="lines">@@ -892,15 +892,11 @@
</span><span class="cx">
</span><span class="cx"> do_action('untrash_comment', $comment_id);
</span><span class="cx">
</span><del>- $comment = array('comment_ID' => $comment_id);
-
- $status = get_comment_meta($comment_id, '_wp_trash_meta_status', true);
</del><ins>+ $status = (string) get_comment_meta($comment_id, '_wp_trash_meta_status', true);
</ins><span class="cx"> if ( empty($status) )
</span><span class="cx"> $status = '0';
</span><span class="cx">
</span><del>- $comment['comment_approved'] = $status;
-
- if ( wp_update_comment($comment) ) {
</del><ins>+ if ( wp_set_comment_status($comment_id, $status) ) {
</ins><span class="cx"> delete_comment_meta($comment_id, '_wp_trash_meta_time');
</span><span class="cx"> delete_comment_meta($comment_id, '_wp_trash_meta_status');
</span><span class="cx"> do_action('untrashed_comment', $comment_id);
</span><span class="lines">@@ -951,11 +947,11 @@
</span><span class="cx">
</span><span class="cx"> do_action('unspam_comment', $comment_id);
</span><span class="cx">
</span><del>- $status = get_comment_meta($comment_id, '_wp_trash_meta_status', true);
</del><ins>+ $status = (string) get_comment_meta($comment_id, '_wp_trash_meta_status', true);
</ins><span class="cx"> if ( empty($status) )
</span><span class="cx"> $status = '0';
</span><span class="cx">
</span><del>- if ( wp_set_comment_status($comment_id, "$status") ) {
</del><ins>+ if ( wp_set_comment_status($comment_id, $status) ) {
</ins><span class="cx"> delete_comment_meta($comment_id, '_wp_trash_meta_status');
</span><span class="cx"> do_action('unspammed_comment', $comment_id);
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>