Skip to content

Commit 9e5ccd0

Browse files
authored
Merge branch 'WordPress:trunk' into trunk
2 parents 97fbe87 + f917e8b commit 9e5ccd0

3 files changed

Lines changed: 12 additions & 0 deletions

File tree

src/wp-includes/kses.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2960,6 +2960,7 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
29602960
* @since 6.0.0 Added `dir`, `lang`, and `xml:lang` to global attributes.
29612961
* @since 6.3.0 Added `aria-controls`, `aria-current`, and `aria-expanded` attributes.
29622962
* @since 6.4.0 Added `aria-live` and `hidden` attributes.
2963+
* @since 7.1.0 Added `tabindex` attribute.
29632964
*
29642965
* @access private
29652966
* @ignore
@@ -2985,6 +2986,7 @@ function _wp_add_global_attributes( $value ) {
29852986
'id' => true,
29862987
'lang' => true,
29872988
'style' => true,
2989+
'tabindex' => true,
29882990
'title' => true,
29892991
'role' => true,
29902992
'xml:lang' => true,

tests/phpunit/tests/ajax/wpAjaxSendAttachmentToEditor.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@
1313
*/
1414
class Tests_Ajax_wpAjaxSendAttachmentToEditor extends WP_Ajax_UnitTestCase {
1515

16+
/**
17+
* Tear down the test fixture.
18+
*/
19+
public function tear_down() {
20+
// Cleanup.
21+
$this->remove_added_uploads();
22+
parent::tear_down();
23+
}
24+
1625
/**
1726
* Shared user ID for the tests.
1827
*

tests/phpunit/tests/kses.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,7 @@ public function test_wp_kses_allowed_html() {
497497
$this->assertTrue( $tag['id'] );
498498
$this->assertTrue( $tag['lang'] );
499499
$this->assertTrue( $tag['style'] );
500+
$this->assertTrue( $tag['tabindex'] );
500501
$this->assertTrue( $tag['title'] );
501502
$this->assertTrue( $tag['xml:lang'] );
502503
}

0 commit comments

Comments
 (0)