WordPress 3.9.1-scripts

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

diff --git a/wp-admin/includes/comment.php b/wp-admin/includes/comment.php
index 8458911575e1a8e68dffcdcd702e29d3e6872e46..a74eeaac2275dfb8f2ec53850a5af746d5e7bd0d 100644 (file)
--- a/wp-admin/includes/comment.php
+++ b/wp-admin/includes/comment.php
@@ -7,14 +7,14 @@
  */
 
 /**
  */
 
 /**

- * {@internal Missing Short Description}}
+ * Determine if a comment exists based on author and date.

  *
  * @since 2.0.0
  * @uses $wpdb
  *
  * @param string $comment_author Author of the comment
  * @param string $comment_date Date of the comment
  *
  * @since 2.0.0
  * @uses $wpdb
  *
  * @param string $comment_author Author of the comment
  * @param string $comment_date Date of the comment

- * @return mixed Comment ID on success.
+ * @return mixed Comment post ID on success.

  */
 function comment_exists($comment_author, $comment_date) {
        global $wpdb;
  */
 function comment_exists($comment_author, $comment_date) {
        global $wpdb;


@@ -36,12 +36,18 @@ 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.' ) );
 
        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'];
-       $_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-       $_POST['comment_approved'] = $_POST['comment_status'];
-       $_POST['comment_content'] = $_POST['content'];
-       $_POST['comment_ID'] = (int) $_POST['comment_ID'];
+       if ( isset( $_POST['newcomment_author'] ) )
+               $_POST['comment_author'] = $_POST['newcomment_author'];
+       if ( isset( $_POST['newcomment_author_email'] ) )
+               $_POST['comment_author_email'] = $_POST['newcomment_author_email'];
+       if ( isset( $_POST['newcomment_author_url'] ) )
+               $_POST['comment_author_url'] = $_POST['newcomment_author_url'];
+       if ( isset( $_POST['comment_status'] ) )
+               $_POST['comment_approved'] = $_POST['comment_status'];
+       if ( isset( $_POST['content'] ) )
+               $_POST['comment_content'] = $_POST['content'];
+       if ( isset( $_POST['comment_ID'] ) )
+               $_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] ) {
 
        foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
                if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {


@@ -68,11 +74,11 @@ function edit_comment() {
 }
 
 /**
 }
 
 /**

- * {@internal Missing Short Description}}
+ * Returns a comment object based on comment ID.

  *
  * @since 2.0.0
  *
  *
  * @since 2.0.0
  *

- * @param int $id ID of comment to retrieve
+ * @param int $id ID of comment to retrieve.

  * @return bool|object Comment if found. False on failure.
  */
 function get_comment_to_edit( $id ) {
  * @return bool|object Comment if found. False on failure.
  */
 function get_comment_to_edit( $id ) {


@@ -83,7 +89,14 @@ function get_comment_to_edit( $id ) {
        $comment->comment_post_ID = (int) $comment->comment_post_ID;
 
        $comment->comment_content = format_to_edit( $comment->comment_content );
        $comment->comment_post_ID = (int) $comment->comment_post_ID;
 
        $comment->comment_content = format_to_edit( $comment->comment_content );

-       $comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content);
+       /**
+        * Filter the comment content before editing.
+        *
+        * @since 2.0.0
+        *
+        * @param string $comment->comment_content Comment content.
+        */
+       $comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );

 
        $comment->comment_author = format_to_edit( $comment->comment_author );
        $comment->comment_author_email = format_to_edit( $comment->comment_author_email );
 
        $comment->comment_author = format_to_edit( $comment->comment_author );
        $comment->comment_author_email = format_to_edit( $comment->comment_author_email );


@@ -148,7 +161,7 @@ function get_pending_comments_num( $post_id ) {
  */
 function floated_admin_avatar( $name ) {
        global $comment;
  */
 function floated_admin_avatar( $name ) {
        global $comment;

-       $avatar = get_avatar( $comment, 32 );
+       $avatar = get_avatar( $comment, 32, 'mystery' );

        return "$avatar $name";
 }
 
        return "$avatar $name";
 }