WordPress 4.3

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

diff --git a/wp-admin/includes/comment.php b/wp-admin/includes/comment.php
index 1620755b68a98c8b5512b8dfcff355c63d1341f3..36954b231c6e70c4b096882395ef4555981f95cc 100644 (file)
--- a/wp-admin/includes/comment.php
+++ b/wp-admin/includes/comment.php
@@ -10,7 +10,8 @@
  * Determine if a comment exists based on author and date.
  *
  * @since 2.0.0
- * @uses $wpdb
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $comment_author Author of the comment
  * @param string $comment_date Date of the comment
@@ -19,11 +20,11 @@
 function comment_exists($comment_author, $comment_date) {
        global $wpdb;
 
-       $comment_author = stripslashes($comment_author);
-       $comment_date = stripslashes($comment_date);
-
        return $wpdb->get_var( $wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
-                       WHERE comment_author = %s AND comment_date = %s", $comment_author, $comment_date) );
+                       WHERE comment_author = %s AND comment_date = %s",
+                       stripslashes( $comment_author ),
+                       stripslashes( $comment_date )
+       ) );
 }
 
 /**
@@ -32,16 +33,21 @@ function comment_exists($comment_author, $comment_date) {
  * @since 2.0.0
  */
 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.' ) );
 
-       $_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] ) {
@@ -73,7 +79,7 @@ function edit_comment() {
  * @since 2.0.0
  *
  * @param int $id ID of comment to retrieve.
- * @return bool|object Comment if found. False on failure.
+ * @return object|false Comment if found. False on failure.
  */
 function get_comment_to_edit( $id ) {
        if ( !$comment = get_comment($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_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 );
@@ -97,7 +110,8 @@ function get_comment_to_edit( $id ) {
  * Get the number of pending comments on a post or posts
  *
  * @since 2.3.0
- * @uses $wpdb
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int|array $post_id Either a single Post ID or an array of Post IDs
  * @return int|array Either a single Posts pending comments as an int or an array of ints keyed on the Post IDs
@@ -141,17 +155,21 @@ function get_pending_comments_num( $post_id ) {
  * Add avatars to relevant places in admin, or try to.
  *
  * @since 2.5.0
- * @uses $comment
+ *
+ * @global object $comment
  *
  * @param string $name User name.
  * @return string Avatar with Admin name.
  */
 function floated_admin_avatar( $name ) {
        global $comment;
-       $avatar = get_avatar( $comment, 32 );
+       $avatar = get_avatar( $comment, 32, 'mystery' );
        return "$avatar $name";
 }
 
+/**
+ * @since 2.7.0
+ */
 function enqueue_comment_hotkeys_js() {
        if ( 'true' == get_user_option( 'comment_shortcuts' ) )
                wp_enqueue_script( 'jquery-table-hotkeys' );