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

Timestamp:

08/09/2016 03:44:26 PM (8 years ago)

Author:

coffee2code

Message:

developer.wordpress.org: Implement Reddit-style voting changes to user contributed notes.

Permits user to un-cast their vote by clicking their vote arrow a second time. Previously a vote could only be changed but not unset.

Props keesiemeijer.
Fixes #1755.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content-voting.php (modified) (4 diffs)

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

@@ -299 +299 @@
         $nonce        = wp_create_nonce( 'user-note-vote-' . $comment_id );
         $disabled_str = __( 'Voting for this note is disabled', 'wporg' );
+        $cancel_str   = __( 'Click to cancel your vote', 'wporg' ); 
         $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' );
@@ -311 +312 @@
         $user_upvoted = self::has_user_upvoted_comment( $comment_id );
         if ( $can_vote ) {
+            $cancel = $user_upvoted ? '. ' . $cancel_str . '.' : ''; 
             $title = $user_upvoted ?
-                __( 'You have voted to indicate this note was helpful', 'wporg' ) :
+                __( 'You have voted to indicate this note was helpful', 'wporg' ) . $cancel :
                 __( 'Vote up if this note was helpful', 'wporg' );
-            $tag = $user_upvoted ? 'span' : 'a';
+            $tag = 'a';
         } else {
             $title = ! $logged_in ? $log_in_str : $disabled_str;
@@ -351 +353 @@
         $user_downvoted = ( $user_upvoted ? false : self::has_user_downvoted_comment( $comment_id ) );
         if ( $can_vote ) {
+            $cancel = $user_downvoted ? '. ' . $cancel_str . '.' : '';
             $title = $user_downvoted ?
-                __( 'You have voted to indicate this note was not helpful', 'wporg' ) :
+                __( 'You have voted to indicate this note was not helpful', 'wporg' ) . $cancel :
                 __( 'Vote down if this note was not helpful', 'wporg' );
-            $tag = $user_downvoted ? 'span' : 'a';
+            $tag = 'a';
         } else {
             $title = ! $logged_in ? $log_in_str : $disabled_str;
@@ -486 +489 @@
         $add_to_list = get_comment_meta( $comment_id, $add_to, true );
 
-        // Don't do anything if user is recasting the same vote as before.
+        // Remove user from list if recasting the same vote as before.
         if ( in_array( $user_id, (array) $add_to_list ) ) {
-            return false;
+            unset( $add_to_list[ array_search( $user_id, $add_to_list ) ] );
+            update_comment_meta( $comment_id, $add_to, $add_to_list );
+            return true;
         }