<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[3560] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content-voting.php: developer.wordpress.org: Make vote arrows actual links for visistors who are not logged in.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/3560">3560</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3560","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-23 16:19:52 +0000 (Thu, 23 Jun 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://meta.trac.wordpress.org/ticket/1649">#1649</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperincusercontentvotingphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content-voting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperincusercontentvotingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content-voting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content-voting.php 2016-06-22 16:06:56 UTC (rev 3559)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content-voting.php 2016-06-23 16:19:52 UTC (rev 3560)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,8 +263,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $can_vote = self::user_can_vote( get_current_user_id(), $comment_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $logged_in = is_user_logged_in();
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_link = get_comment_link( $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = wp_create_nonce( 'user-note-vote-' . $comment_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="user-note-voting" data-nonce="' . esc_attr( $nonce ) . '">';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,19 +280,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Vote up if this note was helpful', 'wporg' );
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = $user_upvoted ? 'span' : 'a';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = ! is_user_logged_in() ?
- __( 'You must log in to vote on the helpfulness of this note', 'wporg' ) :
- '';
- $tag = 'span';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = ! $logged_in ? $log_in_str : $disabled_str;
+ $tag = $logged_in ? 'span' : 'a';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<{$tag} "
</span><span class="cx" style="display: block; padding: 0 10px"> . 'class="user-note-voting-up' . ( $user_upvoted ? ' user-voted' : '' )
</span><span class="cx" style="display: block; padding: 0 10px"> . '" title="' . esc_attr( $title )
</span><span class="cx" style="display: block; padding: 0 10px"> . '" data-id="' . esc_attr( $comment_id )
</span><span class="cx" style="display: block; padding: 0 10px"> . '" data-vote="up';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $user_upvoted ) {
- echo '" href="'
- . esc_url( add_query_arg( array( '_wpnonce' => $nonce , 'comment' => $comment_id, 'vote' => 'up' ), $comment_link ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '">';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span class="dashicons dashicons-arrow-up"></span>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,19 +318,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Vote down if this note was not helpful', 'wporg' );
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = $user_downvoted ? 'span' : 'a';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = ! is_user_logged_in() ?
- __( 'You must log in to vote on the helpfulness of this note', 'wporg' ) :
- '';
- $tag = 'span';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = ! $logged_in ? $log_in_str : $disabled_str;
+ $tag = $logged_in ? 'span' : 'a';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<{$tag} "
</span><span class="cx" style="display: block; padding: 0 10px"> . 'class="user-note-voting-down' . ( $user_downvoted ? ' user-voted' : '' )
</span><span class="cx" style="display: block; padding: 0 10px"> . '" title="' . esc_attr( $title )
</span><span class="cx" style="display: block; padding: 0 10px"> . '" data-id="' . esc_attr( $comment_id )
</span><span class="cx" style="display: block; padding: 0 10px"> . '" data-vote="down';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $user_downvoted ) {
- echo '" href="'
- . esc_url( add_query_arg( array( '_wpnonce' => $nonce , 'comment' => $comment_id, 'vote' => 'down' ), $comment_link ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '">';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span class="dashicons dashicons-arrow-down"></span>';
</span></span></pre>
</div>
</div>
</body>
</html>