Changeset 14519

Timestamp:

09/01/2025 02:43:43 AM (3 months ago)

Author:

dd32

Message:

Trac: Include trailing slashes in user links.

Fixes #8073.

Location:

sites/trunk

Files:

• trac.wordpress.org/templates/site-ticket.html (modified) (3 diffs)
• trac.wordpress.org/templates/site.html (modified) (2 diffs)
• trac.wordpress.org/templates/ticket_change.html (modified) (1 diff)
• wordpress.org/public_html/style/trac/wp-trac.js (modified) (3 diffs)

sites/trunk/trac.wordpress.org/templates/site-ticket.html

@@ -5 +5 @@
 
 <?python
-    profile_link = 'https://profiles.wordpress.org/'
-
   field_types = [ 'milestone', 'priority', 'type', 'severity', 'version', 'component', 'keywords', 'focuses', ]
 
@@ -48 +46 @@
 <!--! Gravatars for the ticket reporter -->
 <td py:match="td[@headers='h_reporter']" py:attrs="select('@*')" py:with="wporg_user = wporg_sanitize_user_nicename(ticket.reporter)">
-  <a href="${profile_link + wporg_user}" data-nicename="${wporg_user}">
+  <a href="https://profiles.wordpress.org/${wporg_user}/" data-nicename="${wporg_user}">
     <img class="avatar" src="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=48" srcset="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=96 2x" height="48" width="48" alt="${wporg_user}'s profile" />
   </a>
@@ -56 +54 @@
 <!--! Gravatars for the ticket owner -->
 <td py:match="td[@headers='h_owner']" py:attrs="select('@*')">
-  <a py:if="ticket.owner" py:with="wporg_user = wporg_sanitize_user_nicename(ticket.owner)" href="${profile_link + wporg_user}">
+  <a py:if="ticket.owner" py:with="wporg_user = wporg_sanitize_user_nicename(ticket.owner)" href="https://profiles.wordpress.org/${wporg_user}/">
     <img class="avatar" src="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=48" srcset="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=96 2x" height="48" width="48" alt="${wporg_user}'s profile" />
   </a>

sites/trunk/trac.wordpress.org/templates/site.html

@@ -5 +5 @@
 
 <?python
-    scripts_version = '227'
+    scripts_version = '228'
     project_slug = req.environ['HTTP_HOST'].split(':')[0].split('.')[0]
     wporg_endpoint = 'https://make.wordpress.org/' + project_slug + '/'
@@ -293 +293 @@
     <py:match path="div[@id='content' and @class='prefs']/div[@id='tabcontent']" once="true">
         <div id="tabcontent">
-            Notifications are sent to the email listed in <a href="${profile_to_edit}${req.session['sid']}">your WordPress.org profile</a><py:if test="req.session['email']"> (${req.session['email']})</py:if>.
+            Notifications are sent to the email listed in <a href="${profile_to_edit}${req.session['sid']}/">your WordPress.org profile</a><py:if test="req.session['email']"> (${req.session['email']})</py:if>.
             <py:if test="notifications_enabled">
                 Notification preferences can be configured <a href="${wporg_endpoint}notifications/">here</a>.

sites/trunk/trac.wordpress.org/templates/ticket_change.html

@@ -156 +156 @@
       <py:when test="'author' in change" py:with="wporg_user = wporg_sanitize_user_nicename(change.author)">
         <span class="avatar" py:if="change">
-          <span class="username-line"><a href="https://profiles.wordpress.org/${wporg_user}" class="profile-link">
+          <span class="username-line"><a href="https://profiles.wordpress.org/${wporg_user}/" class="profile-link">
             <img src="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=48" srcset="https://wordpress.org/grav-redirect.php?user=${wporg_user}&amp;s=96 2x" height="48" width="48" alt="" /> @<span class="username" data-username="${change.author}" data-nicename="${wporg_user}">${authorinfo(change.author)}</span></a></span>
           <py:if test="'date' in change">

sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js

@@ -220 +220 @@
 
                         var meClass = ( username === wpTrac.currentUser ) ? ' me' : '';
-                        return pre + '<a class="mention' + meClass + '" href="https://profiles.wordpress.org/' + username + '">@' + username + '</a>';
+                        return pre + '<a class="mention' + meClass + '" href="https://profiles.wordpress.org/' + username + '/">@' + username + '</a>';
                     } );
 
@@ -361 +361 @@
                 if ( 0 === username.indexOf( 'logged in as' ) ) {
                     username = username.replace( 'logged in as ', '' );
-                    el.html( $('<a />', { href: 'https://profiles.wordpress.org/' + username }).text( username ) ).prepend( 'logged in as ');
+                    el.html( $('<a />', { href: 'https://profiles.wordpress.org/' + username + '/' }).text( username ) ).prepend( 'logged in as ');
                 }
             })(jQuery);
@@ -643 +643 @@
 
                     author = $el.find( '.username' ).data( 'username' );
-                    $commit.append( ' by&nbsp;<a href="https://profiles.wordpress.org/' + author + '">@' + author + '</a>' );
+                    $commit.append( ' by&nbsp;<a href="https://profiles.wordpress.org/' + author + '/">@' + author + '</a>' );
 
                     date = $el.find( '.time-ago' ).html();