Changeset 3560

Timestamp:

06/23/2016 04:19:52 PM (10 years ago)

Author:

coffee2code

Message:

developer.wordpress.org: Make vote arrows actual links for visistors who are not logged in.

Links to login.wordpress.org for login, with a redirect_to back to the code reference note they attempted to vote on.

Also adds a 'title' attribute string when voting is disabled.

Props keesiemeijer for initial patch.
Fixes #1649.

File:

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

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

@@ -264 +264 @@
 
                 $can_vote     = self::user_can_vote( get_current_user_id(), $comment_id );
+                $logged_in    = is_user_logged_in();
                 $comment_link = get_comment_link( $comment_id );
                 $nonce        = wp_create_nonce( 'user-note-vote-' . $comment_id );
+                $disabled_str = __( 'Voting for this note is disabled', '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' );
 
                 echo '<div class="user-note-voting" data-nonce="' . esc_attr( $nonce ) . '">';
@@ -277 +281 @@
                         $tag = $user_upvoted ? 'span' : 'a';
                 } else {
-                        $title = ! is_user_logged_in() ?
-                                __( 'You must log in to vote on the helpfulness of this note', 'wporg' ) :
-                                '';
-                        $tag = 'span';
+                        $title = ! $logged_in ? $log_in_str : $disabled_str;
+                        $tag = $logged_in ? 'span' : 'a';
                 }
                 echo "<{$tag} "
@@ -287 +289 @@
                         . '" data-id="' . esc_attr( $comment_id )
                         . '" data-vote="up';
-                if ( ! $user_upvoted ) {
-                        echo '" href="'
-                                . esc_url( add_query_arg( array( '_wpnonce' => $nonce , 'comment' => $comment_id, 'vote' => 'up' ), $comment_link ) );
+                if ( 'a' === $tag ) {
+                        $up_url = $logged_in ?
+                                add_query_arg( array( '_wpnonce' => $nonce , 'comment' => $comment_id, 'vote' => 'up' ), $comment_link ) :
+                                $log_in_url;
+                        echo '" href="' . esc_url( $up_url );
                 }
                 echo '">';
@@ -315 +319 @@
                         $tag = $user_downvoted ? 'span' : 'a';
                 } else {
-                        $title = ! is_user_logged_in() ?
-                                __( 'You must log in to vote on the helpfulness of this note', 'wporg' ) :
-                                '';
-                        $tag = 'span';
+                        $title = ! $logged_in ? $log_in_str : $disabled_str;
+                        $tag = $logged_in ? 'span' : 'a';
                 }
                 echo "<{$tag} "
@@ -325 +327 @@
                         . '" data-id="' . esc_attr( $comment_id )
                         . '" data-vote="down';
-                if ( ! $user_downvoted ) {
-                        echo '" href="'
-                                . esc_url( add_query_arg( array( '_wpnonce' => $nonce , 'comment' => $comment_id, 'vote' => 'down' ), $comment_link ) );
+                if ( 'a' === $tag ) {
+                        $down_url = $logged_in ?
+                                add_query_arg( array( '_wpnonce' => $nonce , 'comment' => $comment_id, 'vote' => 'down' ), $comment_link ) :
+                                $log_in_url;
+                        echo '" href="' . esc_url( $down_url );
                 }
                 echo '">';