<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11997] trunk/wp-includes/comment.php:
Add conditional to handle get_comment_meta() return value,
make #comment_id required arg for wp_trash_comment()
and wp_untrash_comment(), see #4529</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11997">11997</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-10-05 01:49:19 +0000 (Mon, 05 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add conditional to handle get_comment_meta() return value, make #comment_id required arg for wp_trash_comment() and wp_untrash_comment(), see <a href="http://trac.wordpress.org/ticket/4529">#4529</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (11996 => 11997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2009-10-05 01:08:06 UTC (rev 11996)
+++ trunk/wp-includes/comment.php 2009-10-05 01:49:19 UTC (rev 11997)
</span><span class="lines">@@ -853,17 +853,17 @@
</span><span class="cx"> * @param int $comment_id Comment ID.
</span><span class="cx"> * @return mixed False on failure
</span><span class="cx"> */
</span><del>-function wp_trash_comment($comment_id = 0) {
- if (EMPTY_TRASH_DAYS == 0)
</del><ins>+function wp_trash_comment($comment_id) {
+ if ( EMPTY_TRASH_DAYS == 0 )
</ins><span class="cx"> return wp_delete_comment($comment_id);
</span><span class="cx">
</span><del>- if (!$comment = get_comment($comment_id))
</del><ins>+ if ( !$comment = get_comment($comment_id) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> do_action('trash_comment', $comment_id);
</span><span class="cx">
</span><del>- add_comment_meta($comment_id,'_wp_trash_meta_status', $comment->comment_approved);
- add_comment_meta($comment_id,'_wp_trash_meta_time', time() );
</del><ins>+ add_comment_meta($comment_id, '_wp_trash_meta_status', $comment->comment_approved);
+ add_comment_meta($comment_id, '_wp_trash_meta_time', time() );
</ins><span class="cx">
</span><span class="cx"> wp_set_comment_status($comment_id, 'trash');
</span><span class="cx">
</span><span class="lines">@@ -882,19 +882,25 @@
</span><span class="cx"> * @param int $comment_id Comment ID.
</span><span class="cx"> * @return mixed False on failure
</span><span class="cx"> */
</span><del>-function wp_untrash_comment($comment_id = 0) {
</del><ins>+function wp_untrash_comment($comment_id) {
+ if ( ! (int)$comment_id )
+ return false;
+
</ins><span class="cx"> do_action('untrash_comment', $comment_id);
</span><span class="cx">
</span><del>- $comment = array('comment_ID'=>$comment_id, 'comment_approved'=>'0');
</del><ins>+ $comment = array('comment_ID'=>$comment_id);
</ins><span class="cx">
</span><del>- //Either set comment_approved to the value in comment_meta or worse case to false which will mean moderation
- $comment['comment_approved'] = get_comment_meta($comment_id, '_wp_trash_meta_status', true);
</del><ins>+ $status = get_comment_meta($comment_id, '_wp_trash_meta_status', true);
+ if ( false === $status || '' === $status )
+ $status = '0';
</ins><span class="cx">
</span><ins>+ $comment['comment_approved'] = $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><del>-
</del><ins>+
</ins><span class="cx"> wp_update_comment($comment);
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action('untrashed_comment', $comment_id);
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>