Changeset 56031 for trunk/src/wp-includes/general-template.php

Timestamp:

06/26/2023 10:15:04 AM (22 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Use str_contains() in a few more places.

str_contains() was introduced in PHP 8.0 to perform a case-sensitive check indicating if the string to search in (haystack) contains the given substring (needle).

WordPress core includes a polyfill for str_contains() on PHP < 8.0 as of WordPress 5.9.

This commit replaces false !== strpos( ... ) with str_contains() in core files, making the code more readable and consistent, as well as better aligned with modern development practices.

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

See #58206.

File:

• trunk/src/wp-includes/general-template.php (modified) (2 diffs)

trunk/src/wp-includes/general-template.php

@@ -908 +908 @@
 
     $url = true;
-    if ( strpos( $show, 'url' ) === false &&
-        strpos( $show, 'directory' ) === false &&
-        strpos( $show, 'home' ) === false ) {
+
+    if ( ! str_contains( $show, 'url' )
+        && ! str_contains( $show, 'directory' )
+        && ! str_contains( $show, 'home' )
+    ) {
         $url = false;
     }
@@ -3739 +3741 @@
                 $wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && (int) $match[1] >= 534 );
             } elseif ( $is_IE ) {
-                $wp_rich_edit = ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Trident/7.0;' ) !== false );
+                $wp_rich_edit = str_contains( $_SERVER['HTTP_USER_AGENT'], 'Trident/7.0;' );
             } elseif ( $is_gecko || $is_chrome || $is_edge || ( $is_opera && ! wp_is_mobile() ) ) {
                 $wp_rich_edit = true;