<!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>[11945] trunk:
Move the storage of the metadata for trashed comments into the comment meta table rather than storing it in an option
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11945">11945</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-09-17 20:51:12 +0000 (Thu, 17 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the storage of the metadata for trashed comments into the comment meta table rather than storing it in an option. See <a href="http://trac.wordpress.org/ticket/4529">#4529</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (11944 => 11945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2009-09-17 20:36:59 UTC (rev 11944)
+++ trunk/wp-admin/includes/template.php 2009-09-17 20:51:12 UTC (rev 11945)
</span><span class="lines">@@ -2193,13 +2193,10 @@
</span><span class="cx"> if ( ('reply' == $action || 'quickedit' == $action) && ! $from_ajax )
</span><span class="cx"> $action .= ' hide-if-no-js';
</span><span class="cx"> elseif ($action == 'untrash' && $the_comment_status == 'trash') {
</span><del>- $trash_meta = get_option('wp_trash_meta');
- if (is_array($trash_meta) && isset($trash_meta['comments'][$comment_id]['status'])) {
- if ($trash_meta['comments'][$comment_id]['status'] == '1')
- $action .= ' approve';
- else
- $action .= ' unapprove';
- }
</del><ins>+ if ('1' == get_comment_meta($comment_id, '_wp_trash_meta_status', true))
+ $action .= ' approve';
+ else
+ $action .= ' unapprove';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> echo "<span class='$action'>$sep$link</span>";
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (11944 => 11945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2009-09-17 20:36:59 UTC (rev 11944)
+++ trunk/wp-includes/comment.php 2009-09-17 20:51:12 UTC (rev 11945)
</span><span class="lines">@@ -819,11 +819,8 @@
</span><span class="cx">
</span><span class="cx"> do_action('delete_comment', $comment_id);
</span><span class="cx">
</span><del>- $trash_meta = get_option('wp_trash_meta');
- if (is_array($trash_meta) && isset($trash_meta['comments'][$comment_id])) {
- unset($trash_meta['comments'][$comment_id]);
- update_option('wp_trash_meta', $trash_meta);
- }
</del><ins>+ delete_comment_meta($comment_id,'_wp_trash_meta_status');
+ delete_comment_meta($comment_id,'_wp_trash_meta_time');
</ins><span class="cx">
</span><span class="cx"> if ( ! $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id) ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -865,11 +862,9 @@
</span><span class="cx">
</span><span class="cx"> do_action('trash_comment', $comment_id);
</span><span class="cx">
</span><del>- $trash_meta = get_option('wp_trash_meta', array());
- $trash_meta['comments'][$comment_id]['status'] = $comment->comment_approved;
- $trash_meta['comments'][$comment_id]['time'] = time();
- update_option('wp_trash_meta', $trash_meta);
-
</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"> wp_set_comment_status($comment_id, 'trash');
</span><span class="cx">
</span><span class="cx"> do_action('trashed_comment', $comment_id);
</span><span class="lines">@@ -891,14 +886,10 @@
</span><span class="cx"> do_action('untrash_comment', $comment_id);
</span><span class="cx">
</span><span class="cx"> $comment = array('comment_ID'=>$comment_id, 'comment_approved'=>'0');
</span><ins>+
+ //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);
</ins><span class="cx">
</span><del>- $trash_meta = get_option('wp_trash_meta');
- if (is_array($trash_meta) && isset($trash_meta['comments'][$comment_id])) {
- $comment['comment_approved'] = $trash_meta['comments'][$comment_id]['status'];
- unset($trash_meta['comments'][$comment_id]);
- update_option('wp_trash_meta', $trash_meta);
- }
-
</del><span class="cx"> wp_update_comment($comment);
</span><span class="cx">
</span><span class="cx"> do_action('untrashed_comment', $comment_id);
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (11944 => 11945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2009-09-17 20:36:59 UTC (rev 11944)
+++ trunk/wp-includes/functions.php 2009-09-17 20:51:12 UTC (rev 11945)
</span><span class="lines">@@ -3380,19 +3380,10 @@
</span><span class="cx"> wp_delete_post($post['post_id']);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- //Trashed Comments
- //TODO Come up with a better store for the comment trash meta.
- $trash_meta = get_option('wp_trash_meta');
- if ( !is_array($trash_meta) )
- return;
-
- foreach ( (array) $trash_meta['comments'] as $id => $meta ) {
- if ( $meta['time'] < $delete_timestamp ) {
- wp_delete_comment($id);
- unset($trash_meta['comments'][$id]);
- }
</del><ins>+ $comments_to_delete = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM $wpdb->commentmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A);
+
+ foreach ( (array) $comments_to_delete as $comment ) {
+ wp_delete_comment($comment['comment_id']);
</ins><span class="cx"> }
</span><del>-
- update_option('wp_trash_meta', $trash_meta);
</del><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>