Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-10 21:00:59 +01:00
Code Issues Projects Releases Wiki Activity

Twenty Twenty: Revert usage of str_contains() in theme files.

Browse Source 
The theme supports WordPress 4.7 or later, while the polyfill for str_contains() only exists in WordPress 5.9 or later.

Follow-up to [55988], [57275].

Merges [57276] to the 6.4 branch.

Props poena, SergeyBiryukov.
See #60241.
Built from https://develop.svn.wordpress.org/branches/6.4@57292


git-svn-id: http://core.svn.wordpress.org/branches/6.4@56798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
desrosj 2024-01-16 16:10:08 +00:00
parent 3180171580
commit 191c3cae78
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-content/themes/twentytwenty/comments.php
View File

@ -80,7 +80,7 @@ if ( $comments ) {
$pagination_classes = ''; $pagination_classes = '';
// If we're only showing the "Next" link, add a class indicating so. // If we're only showing the "Next" link, add a class indicating so.
if ( ! str_contains( $comment_pagination, 'prev page-numbers' ) ) { if ( false === strpos( $comment_pagination, 'prev page-numbers' ) ) {
$pagination_classes = ' only-next'; $pagination_classes = ' only-next';
} }
?> ?>

2
wp-content/themes/twentytwenty/functions.php
View File

@ -323,7 +323,7 @@ function twentytwenty_get_custom_logo( $html ) {
); );
// Add a style attribute with the height, or append the height to the style attribute if the style attribute already exists. // Add a style attribute with the height, or append the height to the style attribute if the style attribute already exists.
if ( ! str_contains( $html, ' style=' ) ) { if ( false === strpos( $html, ' style=' ) ) {
$search[] = '/(src=)/'; $search[] = '/(src=)/';
$replace[] = "style=\"height: {$logo_height}px;\" src="; $replace[] = "style=\"height: {$logo_height}px;\" src=";
} else { } else {

4
wp-content/themes/twentytwenty/template-parts/pagination.php
View File

@ -37,12 +37,12 @@ $posts_pagination = get_the_posts_pagination(
); );
// If we're not outputting the previous page link, prepend a placeholder with `visibility: hidden` to take its place. // If we're not outputting the previous page link, prepend a placeholder with `visibility: hidden` to take its place.
if ( ! str_contains( $posts_pagination, 'prev page-numbers' ) ) { if ( false === strpos( $posts_pagination, 'prev page-numbers' ) ) {
$posts_pagination = str_replace( '<div class="nav-links">', '<div class="nav-links"><span class="prev page-numbers placeholder" aria-hidden="true">' . $prev_text . '</span>', $posts_pagination ); $posts_pagination = str_replace( '<div class="nav-links">', '<div class="nav-links"><span class="prev page-numbers placeholder" aria-hidden="true">' . $prev_text . '</span>', $posts_pagination );
} }
// If we're not outputting the next page link, append a placeholder with `visibility: hidden` to take its place. // If we're not outputting the next page link, append a placeholder with `visibility: hidden` to take its place.
if ( ! str_contains( $posts_pagination, 'next page-numbers' ) ) { if ( false === strpos( $posts_pagination, 'next page-numbers' ) ) {
$posts_pagination = str_replace( '</div>', '<span class="next page-numbers placeholder" aria-hidden="true">' . $next_text . '</span></div>', $posts_pagination ); $posts_pagination = str_replace( '</div>', '<span class="next page-numbers placeholder" aria-hidden="true">' . $next_text . '</span></div>', $posts_pagination );
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.4.3-alpha-57291'; $wp_version = '6.4.3-alpha-57292';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.