WordPress 3.4.2-scripts

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

diff --git a/wp-admin/includes/comment.php b/wp-admin/includes/comment.php
index 185251a0cd5be889d6cae7437aebdc0de81b8329..8458911575e1a8e68dffcdcd702e29d3e6872e46 100644 (file)
--- a/wp-admin/includes/comment.php
+++ b/wp-admin/includes/comment.php
@@ -9,11 +9,11 @@
 /**
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.0.0
  * @uses $wpdb
  *
- * @param string $comment_author
- * @param string $comment_date
+ * @param string $comment_author Author of the comment
+ * @param string $comment_date Date of the comment
  * @return mixed Comment ID on success.
  */
 function comment_exists($comment_author, $comment_date) {
@@ -27,16 +27,14 @@ function comment_exists($comment_author, $comment_date) {
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Update a comment with values provided in $_POST.
  *
- * @since unknown
+ * @since 2.0.0
  */
 function edit_comment() {
 
-       $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.' ));
+       if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
+               wp_die ( __( 'You are not allowed to edit comments on this post.' ) );
 
        $_POST['comment_author'] = $_POST['newcomment_author'];
        $_POST['comment_author_email'] = $_POST['newcomment_author_email'];
@@ -52,7 +50,7 @@ function edit_comment() {
                }
        }
 
-       if (!empty ( $_POST['edit_date'] ) ) {
+       if ( !empty ( $_POST['edit_date'] ) ) {
                $aa = $_POST['aa'];
                $mm = $_POST['mm'];
                $jj = $_POST['jj'];
@@ -66,16 +64,16 @@ function edit_comment() {
                $_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
        }
 
-       wp_update_comment( $_POST);
+       wp_update_comment( $_POST );
 }
 
 /**
  * {@internal Missing Short Description}}
  *
- * @since unknown
+ * @since 2.0.0
  *
- * @param unknown_type $id
- * @return unknown
+ * @param int $id ID of comment to retrieve
+ * @return bool|object Comment if found. False on failure.
  */
 function get_comment_to_edit( $id ) {
        if ( !$comment = get_comment($id) )
@@ -98,7 +96,7 @@ function get_comment_to_edit( $id ) {
 /**
  * Get the number of pending comments on a post or posts
  *
- * @since unknown
+ * @since 2.3.0
  * @uses $wpdb
  *
  * @param int|array $post_id Either a single Post ID or an array of Post IDs
@@ -158,10 +156,3 @@ function enqueue_comment_hotkeys_js() {
        if ( 'true' == get_user_option( 'comment_shortcuts' ) )
                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' );
-}
-
-?>