Ticket #3886: 3886.patch

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/admin.php

@@ -22 +22 @@
          */
         public static function do_init() {
                 add_action( 'comment_author', [ __CLASS__, 'append_user_nicename' ], 10, 2 );
+
+                if ( class_exists( 'DevHub_User_Contributed_Notes_Voting' ) ) {
+                        // Add a reset votes checkbox to the comment submit metabox.
+                        add_filter( 'edit_comment_misc_actions', [ __CLASS__, 'add_reset_votes_form_field' ], 10, 2 );
+
+                        // Reset votes after editing a comment in the wp-admin.
+                        add_filter( 'comment_edit_redirect',  [ __CLASS__, 'comment_edit_redirect'], 10, 2 );
+                }
         }
 
         /**
@@ -38 +46 @@
 
                 if ( $comment->user_id ) {
                         $username = get_user_by( 'id', $comment->user_id )->user_nicename;
-        
+
                         $author_name .= '</strong><div class="comment-author-nicename">@' . $username . '</div><strong>';
                 }
 
@@ -45 +53 @@
                 return $author_name;
         }
 
+        /**
+         * Adds a checkbox for resetting the comment votes in the comment submit metabox.
+         *
+         * Only displays the checkbox if the vote score is not zero.
+         *
+         * @param string $html    Html in the submit metabox.
+         * @param object $comment Current comment object.
+         * @return string Output html.
+         */
+        public static function add_reset_votes_form_field( $html, $comment ) {
+                $count = (int) DevHub_User_Contributed_Notes_Voting::count_votes( $comment->comment_ID, 'difference' );
+
+                if ( 0 !== $count ) {
+                        $html .= '<div class="misc-pub-section misc-pub-reset_votes">';
+                        $html .= '<input id="reset_votes" type="checkbox" name="reset_votes" value="on" />';
+                        $html .= '<label for="reset_votes">' . sprintf( __( 'Reset votes (%d)', 'wporg' ), $count )  . '</label></div>';
+                }
+
+                return $html;
+        }
+
+        /**
+         * Reset votes before the user is redirected from the wp-admin (after editing a comment).
+         *
+         * @param string $location   The URI the user will be redirected to.
+         * @param int    $comment_id The ID of the comment being edited.
+         * @return string The redirect URI.
+         */
+        public static function comment_edit_redirect( $location, $comment_id ) {
+                if ( isset( $_POST['reset_votes'] ) && $_POST['reset_votes'] ) {
+                        DevHub_User_Contributed_Notes_Voting::reset_votes( $comment_id );
+                }
+
+                return $location;
+        }
+
 } // DevHub_Admin
 
 DevHub_Admin::init();
-

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content-voting.php

@@ -454 +454 @@
         }
 
         /**
+         * Resets the votes for a comment.
+         *
+         * The current user needs to have the edit_comment capability for the votes to be deleted.
+         *
+         * @access public
+         *
+         * @param int $comment_id The comment ID to reset votes for
+         */
+        public static function reset_votes( $comment_id ) {
+                $comment_id = absint( $comment_id );
+                if ( ! $comment_id || ! current_user_can( 'edit_comment', $comment_id ) ) {
+                        return;
+                }
+
+                delete_comment_meta( $comment_id, self::$meta_upvotes );
+                delete_comment_meta( $comment_id, self::$meta_downvotes );
+        }
+
+        /**
          * Handles abstraction between an up or down vote.
          *
          * @access protected