mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-22 17:18:32 +01:00
AJAX list manipulation fixes for single post comment moderation. Props mdawaffe. fixes #5236
git-svn-id: http://svn.automattic.com/wordpress/trunk@6277 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
babd1e1a7f
commit
fbd325f037
@ -105,7 +105,6 @@ if ('view' == $mode) {
|
|||||||
echo "<ol id='the-comment-list' class='list:comment commentlist' $start>\n";
|
echo "<ol id='the-comment-list' class='list:comment commentlist' $start>\n";
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach ( $comments as $comment ) {
|
foreach ( $comments as $comment ) {
|
||||||
get_comment( $comment ); // Cache it
|
|
||||||
_wp_comment_list_item( $comment->comment_ID, ++$i );
|
_wp_comment_list_item( $comment->comment_ID, ++$i );
|
||||||
}
|
}
|
||||||
echo "</ol>\n\n";
|
echo "</ol>\n\n";
|
||||||
|
@ -131,48 +131,21 @@ if ( 1 == count($posts) ) {
|
|||||||
|
|
||||||
$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date");
|
$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date");
|
||||||
if ($comments) {
|
if ($comments) {
|
||||||
|
// Make sure comments, post, and post_author are cached
|
||||||
update_comment_cache($comments);
|
update_comment_cache($comments);
|
||||||
|
$post = get_post($id);
|
||||||
|
$authordata = get_userdata($post->post_author);
|
||||||
?>
|
?>
|
||||||
<h3 id="comments"><?php _e('Comments') ?></h3>
|
<h3 id="comments"><?php _e('Comments') ?></h3>
|
||||||
<ol id="the-comment-list" class="commentlist">
|
<ol id="the-comment-list" class="list:comment commentlist">
|
||||||
<?php
|
<?php
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach ($comments as $comment) {
|
foreach ( $comments as $comment ) {
|
||||||
|
_wp_comment_list_item( $comment->comment_ID, ++$i );
|
||||||
++$i; $class = '';
|
}
|
||||||
$post = get_post($comment->comment_post_ID);
|
|
||||||
$authordata = get_userdata($post->post_author);
|
|
||||||
$comment_status = wp_get_comment_status($comment->comment_ID);
|
|
||||||
if ('unapproved' == $comment_status)
|
|
||||||
$class .= ' unapproved';
|
|
||||||
if ($i % 2)
|
|
||||||
$class .= ' alternate';
|
|
||||||
echo "<li id='comment-$comment->comment_ID' class='$class'>";
|
|
||||||
?>
|
|
||||||
<p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="edit-comments.php?s=<?php comment_author_IP() ?>&mode=edit"><?php comment_author_IP() ?></a></p>
|
|
||||||
|
|
||||||
<?php comment_text() ?>
|
|
||||||
|
|
||||||
<p><?php comment_date(__('M j, g:i A')); ?> — [
|
|
||||||
<?php
|
|
||||||
if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
|
|
||||||
echo " <a href='comment.php?action=editcomment&c=".$comment->comment_ID."'>" . __('Edit') . '</a>';
|
|
||||||
echo ' | <a href="' . wp_nonce_url('comment.php?action=deletecomment&p=' . $comment->comment_post_ID . '&c=' . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . js_escape(sprintf(__("You are about to delete this comment by '%s'.\n'Cancel' to stop, 'OK' to delete."), $comment->comment_author)) . "', theCommentList );\">" . __('Delete') . '</a> ';
|
|
||||||
if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) {
|
|
||||||
echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&p=' . $comment->comment_post_ID . '&c=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>';
|
|
||||||
echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&p=' . $comment->comment_post_ID . '&c=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>';
|
|
||||||
}
|
|
||||||
echo " | <a href=\"" . wp_nonce_url("comment.php?action=deletecomment&dt=spam&p=" . $comment->comment_post_ID . "&c=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . js_escape(sprintf(__("You are about to mark as spam this comment by '%s'.\n'Cancel' to stop, 'OK' to mark as spam."), $comment->comment_author)) . "', theCommentList );\">" . __('Spam') . "</a> ";
|
|
||||||
}
|
|
||||||
?> ]
|
|
||||||
</p>
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<?php //end of the loop, don't delete
|
|
||||||
} // end foreach
|
|
||||||
echo '</ol>';
|
echo '</ol>';
|
||||||
}//end if comments
|
} // end if comments
|
||||||
?>
|
?>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -318,11 +318,14 @@ if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
|
|||||||
$url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&dt=spam&p=$comment->comment_post_ID&c=$id", "delete-comment_$id" ) );
|
$url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&dt=spam&p=$comment->comment_post_ID&c=$id", "delete-comment_$id" ) );
|
||||||
echo " | <a href='$url' class='delete:the-comment-list:comment-$id::spam=1'>" . __('Spam') . '</a> ';
|
echo " | <a href='$url' class='delete:the-comment-list:comment-$id::spam=1'>" . __('Spam') . '</a> ';
|
||||||
}
|
}
|
||||||
$post = get_post($comment->comment_post_ID, OBJECT, 'display');
|
if ( !is_single() ) {
|
||||||
$post_title = wp_specialchars( $post->post_title, 'double' );
|
$post = get_post($comment->comment_post_ID, OBJECT, 'display');
|
||||||
$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
|
$post_title = wp_specialchars( $post->post_title, 'double' );
|
||||||
|
$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
|
||||||
?>
|
?>
|
||||||
] — <a href="<?php echo get_permalink($comment->comment_post_ID); ?>"><?php echo $post_title; ?></a></p>
|
] — <a href="<?php echo get_permalink($comment->comment_post_ID); ?>"><?php echo $post_title; ?></a>
|
||||||
|
<?php } ?>
|
||||||
|
</p>
|
||||||
</li>
|
</li>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user