Changeset 55988 for trunk/src/wp-login.php

Timestamp:

06/22/2023 02:34:56 PM (21 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Replace usage of strpos() with str_contains().

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 [52039], [52040], [52326], [55703], [55710], [55987].

Props Soean, spacedmonkey, costdev, dingo_d, azaozz, mikeschroder, flixos90, peterwilsoncc, SergeyBiryukov.
Fixes #58206.

File:

• trunk/src/wp-login.php (modified) (2 diffs)

trunk/src/wp-login.php

@@ -1230 +1230 @@
             $redirect_to = $_REQUEST['redirect_to'];
             // Redirect to HTTPS if user wants SSL.
-            if ( $secure_cookie && false !== strpos( $redirect_to, 'wp-admin' ) ) {
+            if ( $secure_cookie && str_contains( $redirect_to, 'wp-admin' ) ) {
                 $redirect_to = preg_replace( '|^http://|', 'https://', $redirect_to );
             }
@@ -1367 +1367 @@
             } elseif ( WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED === $action ) {
                 $errors->add( 'enter_recovery_mode', __( 'Recovery Mode Initialized. Please log in to continue.' ), 'message' );
-            } elseif ( isset( $_GET['redirect_to'] ) && false !== strpos( $_GET['redirect_to'], 'wp-admin/authorize-application.php' ) ) {
+            } elseif ( isset( $_GET['redirect_to'] ) && str_contains( $_GET['redirect_to'], 'wp-admin/authorize-application.php' ) ) {
                 $query_component = wp_parse_url( $_GET['redirect_to'], PHP_URL_QUERY );
                 $query           = array();