Changeset 55157

Timestamp:

01/28/2023 01:46:16 PM (20 months ago)

Author:

SergeyBiryukov

Message:

Database: Replace str_ends_with() usage in wpdb::prepare().

This avoids a fatal error if the file is included directly outside of WordPress core, e.g. by HyperDB.

While WordPress core does include a polyfill function, it is not directly loaded in the wpdb class.

This commit replaces the str_ends_with() calls with substr_compare() for now.

Follow-up to [55151].

Props Otto42.
See #52506.

File:

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

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

@@ -1562 +1562 @@
             $type   = substr( $placeholder, -1 );
 
-            if ( 'f' === $type && true === $this->allow_unsafe_unquoted_parameters && str_ends_with( $split_query[ $key - 1 ], '%' ) ) {
+            if ( 'f' === $type && true === $this->allow_unsafe_unquoted_parameters
+                && 0 === substr_compare( $split_query[ $key - 1 ], '%', -1, 1 )
+            ) {
 
                 /*
@@ -1621 +1623 @@
                      * Second, if "%s" has a "%" before it, even if it's unrelated (e.g. "LIKE '%%%s%%'").
                      */
-                    if ( true !== $this->allow_unsafe_unquoted_parameters || ( '' === $format && ! str_ends_with( $split_query[ $key - 1 ], '%' ) ) ) {
+                    if ( true !== $this->allow_unsafe_unquoted_parameters
+                        || ( '' === $format && 0 !== substr_compare( $split_query[ $key - 1 ], '%', -1, 1 ) )
+                    ) {
                         $placeholder = "'%" . $format . "s'";
                     }