HostForge-Systems/wordpress
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"Trash" fixes, props caesarsgrunt, see #4529

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12290 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz
2009-11-28 03:56:20 +00:00
parent 00a9b90dc9
commit f296da8169
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/comment.php
View File

@@ -892,15 +892,11 @@ function wp_untrash_comment($comment_id) {
do_action('untrash_comment', $comment_id);
$comment = array('comment_ID' => $comment_id);
$status = get_comment_meta($comment_id, '_wp_trash_meta_status', true);
$status = (string) get_comment_meta($comment_id, '_wp_trash_meta_status', true);
if ( empty($status) )
$status = '0';
$comment['comment_approved'] = $status;
if ( wp_update_comment($comment) ) {
if ( wp_set_comment_status($comment_id, $status) ) {
delete_comment_meta($comment_id, '_wp_trash_meta_time');
delete_comment_meta($comment_id, '_wp_trash_meta_status');
do_action('untrashed_comment', $comment_id);
@@ -951,11 +947,11 @@ function wp_unspam_comment($comment_id) {
do_action('unspam_comment', $comment_id);
$status = get_comment_meta($comment_id, '_wp_trash_meta_status', true);
$status = (string) get_comment_meta($comment_id, '_wp_trash_meta_status', true);
if ( empty($status) )
$status = '0';
if ( wp_set_comment_status($comment_id, "$status") ) {
if ( wp_set_comment_status($comment_id, $status) ) {
delete_comment_meta($comment_id, '_wp_trash_meta_status');
do_action('unspammed_comment', $comment_id);
return true;