Wordpress 2.5.1

[autoinstalls/wordpress.git] / wp-admin / includes / comment.php

diff --git a/wp-admin/includes/comment.php b/wp-admin/includes/comment.php
index ae0d1d963107ee734d7a5a5206b81f1214310d9f..0f2aa6140a7a29a5cef2b669aea72ce8289a962c 100644 (file)
--- a/wp-admin/includes/comment.php
+++ b/wp-admin/includes/comment.php
@@ -8,9 +8,7 @@ function comment_exists($comment_author, $comment_date) {
 }
 
 function edit_comment() {
-       global $user_ID;
 
-       $comment_ID = (int) $_POST['comment_ID'];
        $comment_post_ID = (int) $_POST['comment_post_ID'];
 
        if (!current_user_can( 'edit_post', $comment_post_ID ))
@@ -23,6 +21,14 @@ function edit_comment() {
        $_POST['comment_content'] = $_POST['content'];
        $_POST['comment_ID'] = (int) $_POST['comment_ID'];
 
+       foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
+               if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
+                       $_POST['edit_date'] = '1';
+                       break;
+               }
+       }
+
+
        if (!empty ( $_POST['edit_date'] ) ) {
                $aa = $_POST['aa'];
                $mm = $_POST['mm'];
@@ -60,9 +66,50 @@ function get_comment_to_edit( $id ) {
 
 function get_pending_comments_num( $post_id ) {
        global $wpdb;
-       $post_id = (int) $post_id;
-       $pending = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = $post_id AND comment_approved = '0'" );
-       return $pending;
+
+       $single = false;
+       if ( !is_array($post_id) ) {
+               $post_id = (array) $post_id;
+               $single = true;
+       }
+       $post_id = array_map('intval', $post_id);
+       $post_id = "'" . implode("', '", $post_id) . "'";
+
+       $pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_N );
+
+       if ( empty($pending) )
+               return 0;
+
+       if ( $single )
+               return $pending[0][1];
+
+       $pending_keyed = array();
+       foreach ( $pending as $pend )
+               $pending_keyed[$pend[0]] = $pend[1];
+
+       return $pending_keyed;
+}
+
+// Add avatars to relevant places in admin, or try to
+
+function floated_admin_avatar( $name ) {
+       global $comment;
+
+       $id = $avatar = false;
+       if ( $comment->comment_author_email )
+               $id = $comment->comment_author_email;
+       if ( $comment->user_id )
+               $id = $comment->user_id;
+
+       if ( $id )
+               $avatar = get_avatar( $id, 32 );
+
+       return "$avatar $name";
+}
+
+if ( is_admin() && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) {
+       if ( get_option('show_avatars') )
+               add_filter( 'comment_author', 'floated_admin_avatar' );
 }
 
-?>
\ No newline at end of file
+?>