<!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>[45318] branches/5.2/src/wp-admin: Accessibility: Add aria-current to the links in the <nav> elements introduced in [44905].</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 { white-space: pre-line; 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="https://core.trac.wordpress.org/changeset/45318">45318</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/45318","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-05-16 16:33:42 +0000 (Thu, 16 May 2019)</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'>Accessibility: Add aria-current to the links in the <nav> elements introduced in <a href="https://core.trac.wordpress.org/changeset/44905">[44905]</a>.
Also fixes a few translators comments and coding standards.
Merges <a href="https://core.trac.wordpress.org/changeset/45300">[45300]</a> to the 5.2 branch.
Props audrasjb, afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/47106">#47106</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches52srcwpadminaboutphp">branches/5.2/src/wp-admin/about.php</a></li>
<li><a href="#branches52srcwpadmincreditsphp">branches/5.2/src/wp-admin/credits.php</a></li>
<li><a href="#branches52srcwpadminfreedomsphp">branches/5.2/src/wp-admin/freedoms.php</a></li>
<li><a href="#branches52srcwpadminincludesmsphp">branches/5.2/src/wp-admin/includes/ms.php</a></li>
<li><a href="#branches52srcwpadminnavmenusphp">branches/5.2/src/wp-admin/nav-menus.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches52">branches/5.2/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.2
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.2 2019-05-16 02:24:58 UTC (rev 45317)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.2 2019-05-16 16:33:42 UTC (rev 45318)
</ins><a id="branches52"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.2</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:45285,45287,45289,45292,45296,45308-45311
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:45285,45287,45289,45292,45296,45300,45308-45311
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches52srcwpadminaboutphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/src/wp-admin/about.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/src/wp-admin/about.php 2019-05-16 02:24:58 UTC (rev 45317)
+++ branches/5.2/src/wp-admin/about.php 2019-05-16 16:33:42 UTC (rev 45318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <nav class="nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="about.php" class="nav-tab nav-tab-active"><?php _e( 'What’s New' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="about.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'What’s New' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
</span></span></pre></div>
<a id="branches52srcwpadmincreditsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/src/wp-admin/credits.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/src/wp-admin/credits.php 2019-05-16 02:24:58 UTC (rev 45317)
+++ branches/5.2/src/wp-admin/credits.php 2019-05-16 16:33:42 UTC (rev 45318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,15 +18,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap about-wrap full-width-layout">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h1>
+ <?php
+ /* translators: %s: The current WordPress version number */
+ printf( __( 'Welcome to WordPress %s' ), $display_version );
+ ?>
+</h1>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="about-text"><?php printf( __( 'Congratulations on updating to WordPress 5.2! This update makes it easier than ever to fix your site if something goes wrong.' ), $display_version ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="wp-badge">
+ <?php
+ /* translators: %s: The current WordPress version number */
+ printf( __( 'Version %s' ), $display_version );
+ ?>
+</div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <nav class="nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="about.php" class="nav-tab"><?php _e( 'What’s New' ); ?></a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="credits.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Credits' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </nav>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,8 +48,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $credits ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="about-description">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://wordpress.org/about/',
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://make.wordpress.org/' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,6 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // These are strings returned by the API that we want to be translatable
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Project Leaders' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* translators: %s: The current WordPress version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Core Contributors to WordPress %s' );
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Noteworthy Contributors' );
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Cofounder, Project Lead' );
</span></span></pre></div>
<a id="branches52srcwpadminfreedomsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/src/wp-admin/freedoms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/src/wp-admin/freedoms.php 2019-05-16 02:24:58 UTC (rev 45317)
+++ branches/5.2/src/wp-admin/freedoms.php 2019-05-16 16:33:42 UTC (rev 45318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,27 +18,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $is_privacy_notice = isset( $_GET['privacy-notice'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_privacy_notice ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $freedoms_class = '';
- $privacy_class = ' nav-tab-active';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $freedoms_class = '';
+ $privacy_class = ' nav-tab-active';
+ $freedoms_aria_current = '';
+ $privacy_aria_current = ' aria-current="page"';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $freedoms_class = ' nav-tab-active';
- $privacy_class = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $freedoms_class = ' nav-tab-active';
+ $privacy_class = '';
+ $freedoms_aria_current = ' aria-current="page"';
+ $privacy_aria_current = '';
</ins><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"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap about-wrap full-width-layout">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h1>
+ <?php
+ /* translators: %s: The current WordPress version number */
+ printf( __( 'Welcome to WordPress %s' ), $display_version );
+ ?>
+</h1>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="about-text"><?php printf( __( 'Congratulations on updating to WordPress 5.2! This update makes it easier than ever to fix your site if something goes wrong.' ), $display_version ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<div class="wp-badge">
+ <?php
+ /* translators: %s: The current WordPress version number */
+ printf( __( 'Version %s' ), $display_version );
+ ?>
+</div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <nav class="nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="about.php" class="nav-tab"><?php _e( 'What’s New' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="freedoms.php" class="nav-tab<?php echo $freedoms_class; ?>"><?php _e( 'Freedoms' ); ?></a>
- <a href="freedoms.php?privacy-notice" class="nav-tab<?php echo $privacy_class; ?>"><?php _e( 'Privacy' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="freedoms.php" class="nav-tab<?php echo $freedoms_class; ?>"<?php echo $freedoms_aria_current; ?>><?php _e( 'Freedoms' ); ?></a>
+ <a href="freedoms.php?privacy-notice" class="nav-tab<?php echo $privacy_class; ?>"<?php echo $privacy_aria_current; ?>><?php _e( 'Privacy' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </nav>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $is_privacy_notice ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,9 +60,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="about-wrap-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="about-description"><?php _e( 'From time to time, your WordPress site may send data to WordPress.org — including, but not limited to — the version of WordPress you are using, and a list of installed plugins and themes.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php printf( __( 'This data is used to provide general enhancements to WordPress, which includes helping to protect your site by finding and automatically installing new updates. It is also used to calculate statistics, such as those shown on the <a href="%s">WordPress.org stats page</a>.' ), 'https://wordpress.org/about/stats/' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <?php
+ /* translators: %s: https://wordpress.org/about/stats/ */
+ printf( __( 'This data is used to provide general enhancements to WordPress, which includes helping to protect your site by finding and automatically installing new updates. It is also used to calculate statistics, such as those shown on the <a href="%s">WordPress.org stats page</a>.' ), 'https://wordpress.org/about/stats/' );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php printf( __( 'We take privacy and transparency very seriously. To learn more about what data we collect, and how we use it, please visit <a href="%s">WordPress.org/about/privacy</a>.' ), 'https://wordpress.org/about/privacy/' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <?php
+ /* translators: %s: https://wordpress.org/about/privacy/ */
+ printf( __( 'We take privacy and transparency very seriously. To learn more about what data we collect, and how we use it, please visit <a href="%s">WordPress.org/about/privacy</a>.' ), 'https://wordpress.org/about/privacy/' );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +79,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="about-wrap-content">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="feature-section has-1-columns">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Freedoms' ); ?></h2>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="about-description"><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'https://wordpress.org/about/license/' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="about-description">
+ <?php
+ /* translators: %s: https://wordpress.org/about/license/ */
+ printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'https://wordpress.org/about/license/' );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="feature-section has-4-columns is-fullwidth">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,13 +111,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="feature-section has-1-columns">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We’re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'https://wordpressfoundation.org/trademark-policy/' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <?php
+ /* translators: %s: https://wordpressfoundation.org/trademark-policy/ */
+ printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We’re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'https://wordpressfoundation.org/trademark-policy/' );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : __( 'https://wordpress.org/plugins/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: https://wordpress.org/about/license/ */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it’s GPL</a> first. If they don’t respect the WordPress license, we don’t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="branches52srcwpadminincludesmsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/src/wp-admin/includes/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/src/wp-admin/includes/ms.php 2019-05-16 02:24:58 UTC (rev 45317)
+++ branches/5.2/src/wp-admin/includes/ms.php 2019-05-16 16:33:42 UTC (rev 45318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1118,9 +1118,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Link classes
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = array( 'nav-tab' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Aria-current attribute.
+ $aria_current = '';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Selected is set by the parent OR assumed by the $pagenow global
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $r['selected'] === $link_id || $link['url'] === $GLOBALS['pagenow'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $classes[] = 'nav-tab-active';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $classes[] = 'nav-tab-active';
+ $aria_current = ' aria-current="page"';
</ins><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"> // Escape each class
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1130,7 +1134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( array( 'id' => $r['blog_id'] ), network_admin_url( $link['url'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add link to nav links
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $screen_links[ $link_id ] = '<a href="' . esc_url( $url ) . '" id="' . esc_attr( $link_id ) . '" class="' . $esc_classes . '">' . esc_html( $link['label'] ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $screen_links[ $link_id ] = '<a href="' . esc_url( $url ) . '" id="' . esc_attr( $link_id ) . '" class="' . $esc_classes . '"' . $aria_current . '>' . esc_html( $link['label'] ) . '</a>';
</ins><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"> // All done!
</span></span></pre></div>
<a id="branches52srcwpadminnavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.2/src/wp-admin/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.2/src/wp-admin/nav-menus.php 2019-05-16 02:24:58 UTC (rev 45317)
+++ branches/5.2/src/wp-admin/nav-menus.php 2019-05-16 16:33:42 UTC (rev 45318)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,8 +620,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_tab_active_class = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nav_aria_current = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_tab_active_class = ' nav-tab-active';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nav_aria_current = ' aria-current="page"';
</ins><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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,15 +630,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <hr class="wp-header-end">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <nav class="nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php echo $nav_tab_active_class; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php echo $nav_tab_active_class; ?>"<?php echo $nav_aria_current; ?>><?php esc_html_e( 'Edit Menus' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $num_locations && $menu_count ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $active_tab_class = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $aria_current = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $locations_screen ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $active_tab_class = ' nav-tab-active';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $aria_current = ' aria-current="page"';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php echo $active_tab_class; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php echo $active_tab_class; ?>"<?php echo $aria_current; ?>><?php esc_html_e( 'Manage Locations' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -878,7 +882,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_name_val = 'value="' . esc_attr( $nav_menu_selected_title ) . '"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="hidden" name="action" value="update" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="hidden" name="action" value="update" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="nav-menu-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="major-publishing-actions wp-clearfix">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -956,8 +960,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $menu_locations[ $location ] ) && $menu_locations[ $location ] != $nav_menu_selected_id ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="theme-location-set">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: menu name */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: menu name */
</ins><span class="cx" style="display: block; padding: 0 10px"> _x( '(Currently set to: %s)', 'menu location' ),
</span><span class="cx" style="display: block; padding: 0 10px"> wp_get_nav_menu_object( $menu_locations[ $location ] )->name
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre>
</div>
</div>
</body>
</html>