<!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>[60062] trunk: General: Improve `aria-current` management in `get_custom_logo()`.</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/60062">60062</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/60062","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-03-21 13:54:38 +0000 (Fri, 21 Mar 2025)</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'>General: Improve `aria-current` management in `get_custom_logo()`.
This changeset fixes a edge case in `get_custom_logo()` where a page was set for the homepage without any front page in Settings > Reading and the `aria-current` attribute wasn't present on the logo link.
Props bschneidewind, audrasjb, siliconforks, sabernhardt, faisal03, shailu25, peterwilsoncc.
Fixes <a href="https://core.trac.wordpress.org/ticket/62879">#62879</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunktestsphpunittestsgeneraltemplatephp">trunk/tests/phpunit/tests/general/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2025-03-20 23:01:33 UTC (rev 60061)
+++ trunk/src/wp-includes/general-template.php 2025-03-21 13:54:38 UTC (rev 60062)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1118,7 +1118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $image
</span><span class="cx" style="display: block; padding: 0 10px"> );
</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">- $aria_current = is_front_page() && ! is_paged() ? ' aria-current="page"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $aria_current = ! is_paged() && ( is_front_page() || is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) ? ' aria-current="page"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%1$s" class="custom-logo-link" rel="home"%2$s>%3$s</a>',
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/general/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/template.php 2025-03-20 23:01:33 UTC (rev 60061)
+++ trunk/tests/phpunit/tests/general/template.php 2025-03-21 13:54:38 UTC (rev 60062)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,6 +18,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $custom_logo_id;
</span><span class="cx" style="display: block; padding: 0 10px"> public $custom_logo_url;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Blog page used by aria tests.
+ *
+ * @var int
+ */
+ public static $blog_page_id;
+
+ /**
+ * Home page used by aria tests.
+ *
+ * @var int
+ */
+ public static $home_page_id;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Declare theme support for custom logo.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,6 +47,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * remove_filter( 'pre_set_theme_mod_custom_logo', '_sync_custom_logo_to_site_logo' );
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'custom-logo' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ self::$blog_page_id = self::factory()->post->create(
+ array(
+ 'post_type' => 'page',
+ 'post_title' => 'Blog',
+ 'page_name' => 'blog',
+ )
+ );
+
+ self::$home_page_id = self::factory()->post->create(
+ array(
+ 'post_type' => 'page',
+ 'post_title' => 'Home',
+ 'page_name' => 'home',
+ )
+ );
</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"> public static function wpTearDownAfterClass() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,6 +553,139 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test the aria attribute for the custom logo on the front page set to the blog.
+ *
+ * @ticket 62879
+ *
+ * @covers ::get_custom_logo
+ *
+ * @dataProvider data_get_custom_logo_aria_current_attribute_blog_front_page
+ *
+ * @param string $url The URL to visit.
+ * @param bool $attribute_expected Whether the aria-current attribute is expected.
+ */
+ public function test_get_custom_logo_aria_current_attribute_blog_front_page( $url, $attribute_expected ) {
+ // Set the custom logo.
+ $this->set_custom_logo();
+ $this->go_to( $url );
+
+ $this->assertNotEmpty( get_custom_logo(), 'Custom logo is expected to be set' );
+
+ if ( $attribute_expected ) {
+ $this->assertStringContainsString( 'aria-current="page"', get_custom_logo(), 'Custom logo is expected to contain aria-current attribute' );
+ } else {
+ $this->assertStringNotContainsString( 'aria-current="page"', get_custom_logo(), 'Custom logo is expected to contain aria-current attribute' );
+ }
+ }
+
+ /**
+ * Data provider for the test_get_custom_logo_aria_current_attribute_blog_front_page.
+ *
+ * @return array[]
+ */
+ public function data_get_custom_logo_aria_current_attribute_blog_front_page() {
+ return array(
+ 'Front page' => array( home_url(), true ),
+ 'Blog post' => array( home_url( '/?p=1' ), false ),
+ 'Sample page' => array( home_url( '/?page_id=2' ), false ),
+ );
+ }
+
+ /**
+ * Test the aria attribute for the custom logo on the front page set to the blog.
+ *
+ * @ticket 62879
+ *
+ * @covers ::get_custom_logo
+ *
+ * @dataProvider data_get_custom_logo_aria_current_attribute_blog_set_to_page_without_front_page_defined
+ * @param string $url The URL to visit.
+ * @param bool $attribute_expected Whether the aria-current attribute is expected.
+ */
+ public function test_get_custom_logo_aria_current_attribute_blog_set_to_page_without_front_page_defined( $url, $attribute_expected ) {
+ // Set up pretty permalinks.
+ update_option( 'permalink_structure', '/%postname%/' );
+
+ // Set posts to show on a static page.
+ update_option( 'show_on_front', 'page' );
+ update_option( 'page_for_posts', self::$blog_page_id );
+
+ // Set the custom logo.
+ $this->set_custom_logo();
+ $this->go_to( $url );
+
+ $this->assertNotEmpty( get_custom_logo(), 'Custom logo is expected to be set' );
+
+ if ( $attribute_expected ) {
+ $this->assertStringContainsString( 'aria-current="page"', get_custom_logo(), 'Custom logo is expected to contain aria-current attribute' );
+ } else {
+ $this->assertStringNotContainsString( 'aria-current="page"', get_custom_logo(), 'Custom logo is expected to contain aria-current attribute' );
+ }
+ }
+
+ /**
+ * Data provider for the test_get_custom_logo_aria_current_attribute_blog_set_to_page_without_front_page_defined.
+ *
+ * @return array[]
+ */
+ public function data_get_custom_logo_aria_current_attribute_blog_set_to_page_without_front_page_defined() {
+ return array(
+ 'Front page' => array( home_url(), true ),
+ 'Blog index' => array( home_url( '/blog/' ), true ),
+ 'Blog post' => array( home_url( '/?p=1' ), false ),
+ 'Sample page' => array( home_url( '/?page_id=2' ), false ),
+ );
+ }
+
+ /**
+ * Test the aria attribute for the custom logo on the front page set to the blog.
+ *
+ * @ticket 62879
+ *
+ * @covers ::get_custom_logo
+ *
+ * @dataProvider data_get_custom_logo_aria_current_attribute_blog_set_to_page_with_front_page_defined
+ *
+ * @param string $url The URL to visit.
+ * @param bool $attribute_expected Whether the aria-current attribute is expected.
+ */
+ public function test_get_custom_logo_aria_current_attribute_blog_set_to_page_with_front_page_defined( $url, $attribute_expected ) {
+ // Set up pretty permalinks.
+ update_option( 'permalink_structure', '/%postname%/' );
+
+ // Set posts to show on a static page, show static page on front.
+ update_option( 'show_on_front', 'page' );
+ update_option( 'page_for_posts', self::$blog_page_id );
+ update_option( 'page_on_front', self::$home_page_id );
+
+ // Set the custom logo.
+ $this->set_custom_logo();
+ $this->go_to( $url );
+
+ $this->assertNotEmpty( get_custom_logo(), 'Custom logo is expected to be set' );
+
+ if ( $attribute_expected ) {
+ $this->assertStringContainsString( 'aria-current="page"', get_custom_logo(), 'Custom logo is expected to contain aria-current attribute' );
+ } else {
+ $this->assertStringNotContainsString( 'aria-current="page"', get_custom_logo(), 'Custom logo is expected to contain aria-current attribute' );
+ }
+ }
+
+ /**
+ * Data provider for the test_get_custom_logo_aria_current_attribute_blog_set_to_page_with_front_page_defined.
+ *
+ * @return array[]
+ */
+ public function data_get_custom_logo_aria_current_attribute_blog_set_to_page_with_front_page_defined() {
+ return array(
+ 'Front page' => array( home_url(), true ),
+ 'Blog index' => array( home_url( '/blog/' ), true ),
+ 'Blog post' => array( home_url( '/?p=1' ), false ),
+ 'Sample page' => array( home_url( '/?page_id=2' ), false ),
+ );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 40969
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_header
</span></span></pre>
</div>
</div>
</body>
</html>