Changeset 55158

Timestamp:

01/28/2023 08:56:10 PM (20 months ago)

Author:

SergeyBiryukov

Message:

Database: Replace substr_compare() usage with substr() in wpdb::prepare().

This amends the previous commit to avoid a warning on PHP < 7.2.18 if haystack is an empty string:

Warning: substr_compare(): The start position cannot exceed initial string length

Follow-up to [55151], [55157].

See #52506.

File:

• trunk/src/wp-includes/class-wpdb.php (modified) (2 diffs)

trunk/src/wp-includes/class-wpdb.php

@@ -1563 +1563 @@
 
             if ( 'f' === $type && true === $this->allow_unsafe_unquoted_parameters
-                && 0 === substr_compare( $split_query[ $key - 1 ], '%', -1, 1 )
+                && '%' === substr( $split_query[ $key - 1 ], -1, 1 )
             ) {
 
@@ -1624 +1624 @@
                      */
                     if ( true !== $this->allow_unsafe_unquoted_parameters
-                        || ( '' === $format && 0 !== substr_compare( $split_query[ $key - 1 ], '%', -1, 1 ) )
+                        || ( '' === $format && '%' !== substr( $split_query[ $key - 1 ], -1, 1 ) )
                     ) {
                         $placeholder = "'%" . $format . "s'";