Ticket #1755: 1755.patch

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

@@ -131 +131 @@
                 function wporg_developer_user_note( $comment, $args, $depth ) {
                         $GLOBALS['comment'] = $comment;
                         $count = (int) DevHub_User_Contributed_Notes_Voting::count_votes( $comment->comment_ID, 'difference' );
+                        $curr_user_note = DevHub_User_Contributed_Notes_Voting::is_current_user_note( $comment->comment_ID );
                         $comment_class = ( -1 > $count ) ? 'bad-note' : '';
+                        $comment_class .= $curr_user_note ? ' user-submitted-vote' : '';
+                        $comment_class = trim( $comment_class );
                         ?>
 
                         <li id="comment-<?php comment_ID(); ?>" <?php comment_class( $comment_class ); ?>>

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

@@ -194 +194 @@
                 // Comment, if provided, must be approved.
                 if ( $comment_id ) {
                         $can = ( '1' == get_comment( $comment_id )->comment_approved );
+                        // Users can't vote on their own comments.
+                        if ( $can && self::is_current_user_note( $comment_id ) ) {
+                                $can = false;
+                        }
                 }
 
                 return apply_filters( 'devhub_user_can_vote', $can, $user_id, $comment_id );
         }
 
         /**
+         * Determines if a note was submitted by the current user.
+         *
+         * @param int     $comment_id The comment ID, or empty to use current comment.
+         * @return bool True if the note was submitted by the current user.
+         */
+        public static function is_current_user_note( $comment_id = '' ) {
+
+                if ( ! $comment_id ) {
+                        global $comment;
+                        $comment_id = $comment->comment_ID;
+                }
+
+                $note    = get_comment( $comment_id );
+                $user_id = get_current_user_id();
+
+                if ( ! $note || ! $user_id ) {
+                        return false;
+                }
+
+                if ( (int) $note->user_id === $user_id ) {
+                        return true;
+                }
+
+                return false;
+        }
+
+        /**
          * Has user upvoted the comment?
          *
          * @access public
@@ -263 +294 @@
                 }
 
                 $can_vote     = self::user_can_vote( get_current_user_id(), $comment_id );
+                $user_note    = self::is_current_user_note( $comment_id );
                 $logged_in    = is_user_logged_in();
                 $comment_link = get_comment_link( $comment_id );
                 $nonce        = wp_create_nonce( 'user-note-vote-' . $comment_id );
@@ -270 +302 @@
                 $log_in_str   = __( 'You must log in to vote on the helpfulness of this note', 'wporg' );
                 $log_in_url   = add_query_arg( 'redirect_to', urlencode( $comment_link ), 'https://login.wordpress.org' );
 
+                if ( !$can_vote && $user_note ) {
+                        $disabled_str = __( 'Voting for your own note is disabled', 'wporg' );
+                }
+
                 echo '<div class="user-note-voting" data-nonce="' . esc_attr( $nonce ) . '">';
 
                 // Up vote link

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/scss/main.scss

@@ -1478 +1478 @@
         .user-voted.user-note-voting-down .dashicons {
                 color: red;
         }
+        .user-submitted-vote .dashicons {
+                color: grey;
+        }
 
         .syntaxhighlighter {
                 /* These are !important due to use of !important in SyntaxHighlighter Evolved plugin. */

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/stylesheets/main.css

@@ -1568 +1568 @@
 .devhub-wrap .user-voted.user-note-voting-down .dashicons {
   color: red;
 }
+.devhub-wrap .user-submitted-vote .dashicons {
+  color: grey;
+}
 .devhub-wrap .syntaxhighlighter {
   /* These are !important due to use of !important in SyntaxHighlighter Evolved plugin. */
   max-width: 100% !important;