Changes in trunk/wp-admin/includes/comment.php [17232:13420]

File:

• trunk/wp-admin/includes/comment.php (modified) (7 diffs)

trunk/wp-admin/includes/comment.php

@@ -10 +10 @@
  * {@internal Missing Short Description}}
  *
- * @since 2.0.0
+ * @since unknown
  * @uses $wpdb
  *
- * @param string $comment_author Author of the comment
- * @param string $comment_date Date of the comment
+ * @param string $comment_author
+ * @param string $comment_date
  * @return mixed Comment ID on success.
  */
@@ -28 +28 @@
 
 /**
- * Update a comment with values provided in $_POST.
+ * {@internal Missing Short Description}}
  *
- * @since 2.0.0
+ * @since unknown
  */
 function edit_comment() {
 
-    if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
-        wp_die ( __( 'You are not allowed to edit comments on this post.' ) );
+    $comment_post_ID = (int) $_POST['comment_post_ID'];
+
+    if (!current_user_can( 'edit_post', $comment_post_ID ))
+        wp_die( __('You are not allowed to edit comments on this post, so you cannot edit this comment.' ));
 
     $_POST['comment_author'] = $_POST['newcomment_author'];
@@ -51 +53 @@
     }
 
-    if ( !empty ( $_POST['edit_date'] ) ) {
+    if (!empty ( $_POST['edit_date'] ) ) {
         $aa = $_POST['aa'];
         $mm = $_POST['mm'];
@@ -65 +67 @@
     }
 
-    wp_update_comment( $_POST );
+    wp_update_comment( $_POST);
 }
 
@@ -71 +73 @@
  * {@internal Missing Short Description}}
  *
- * @since 2.0.0
+ * @since unknown
  *
- * @param int $id ID of comment to retrieve
- * @return bool|object Comment if found. False on failure.
+ * @param unknown_type $id
+ * @return unknown
  */
 function get_comment_to_edit( $id ) {
@@ -97 +99 @@
  * Get the number of pending comments on a post or posts
  *
- * @since 2.3.0
+ * @since unknown
  * @uses $wpdb
  *
@@ -157 +159 @@
         wp_enqueue_script( 'jquery-table-hotkeys' );
 }
+
+if ( is_admin() && isset($pagenow) && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) {
+    if ( get_option('show_avatars') )
+        add_filter( 'comment_author', 'floated_admin_avatar' );
+}
+
 ?>