mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-09 06:32:28 +02:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

General: Improve aria-current management in get_custom_logo().

Browse Source 
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 #62879.



git-svn-id: https://develop.svn.wordpress.org/trunk@60062 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jb Audras 2025-03-21 13:54:38 +00:00
parent 1563bf7344
commit 4d19161cdc
2 changed files with 164 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/general-template.php
View File

@ -1118,7 +1118,7 @@ function get_custom_logo( $blog_id = 0 ) {
$image
);
} else {
$aria_current = is_front_page() && ! is_paged() ? ' aria-current="page"' : '';
$aria_current = ! is_paged() && ( is_front_page() || is_home() && ( (int) get_option( 'page_for_posts' ) !== get_queried_object_id() ) ) ? ' aria-current="page"' : '';
$html = sprintf(
'<a href="%1$s" class="custom-logo-link" rel="home"%2$s>%3$s</a>',

163
tests/phpunit/tests/general/template.php
View File

@ -18,6 +18,20 @@ class Tests_General_Template extends WP_UnitTestCase {
public $custom_logo_id;
public $custom_logo_url;
/**
* 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;
public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
/*
* Declare theme support for custom logo.
@ -33,6 +47,22 @@ class Tests_General_Template extends WP_UnitTestCase {
* remove_filter( 'pre_set_theme_mod_custom_logo', '_sync_custom_logo_to_site_logo' );
*/
add_theme_support( 'custom-logo' );
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',
)
);
}
public static function wpTearDownAfterClass() {
@ -522,6 +552,139 @@ class Tests_General_Template extends WP_UnitTestCase {
$this->assertSame( $expected, $result );
}
/**
* 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 ),
);
}
/**
* @ticket 40969
*