Changeset 41663

Timestamp:

10/02/2017 02:44:48 AM (7 years ago)

Author:

pento

Message:

Database: Fix some PHP errors introduced in [41662].

PHP < 5.4 requires a $matches parameter to be passed to preg_match_all()

wpdb::prepare() can be called before translations are loaded, so needs appropriate wp_load_translations_early() calls.

See #42040.

File:

• trunk/src/wp-includes/wp-db.php (modified) (3 diffs)

trunk/src/wp-includes/wp-db.php

@@ -1231 +1231 @@
         // This is not meant to be foolproof -- but it will catch obviously incorrect usage.
         if ( strpos( $query, '%' ) === false ) {
+            wp_load_translations_early();
             _doing_it_wrong( 'wpdb::prepare', sprintf( __( 'The query argument of %s must have a placeholder.' ), 'wpdb::prepare()' ), '3.9.0' );
         }
@@ -1244 +1245 @@
         foreach ( $args as $arg ) {
             if ( ! is_scalar( $arg ) && ! is_null( $arg ) ) {
+                wp_load_translations_early();
                 _doing_it_wrong( 'wpdb::prepare', sprintf( __( 'Unsupported value type (%s).' ), gettype( $arg ) ), '4.8.2' );
             }
@@ -1255 +1257 @@
 
         // Count the number of valid placeholders in the query
-        $placeholders = preg_match_all( '/(^|[^%]|(%%)+)%[sdF]/', $query );
+        $placeholders = preg_match_all( '/(^|[^%]|(%%)+)%[sdF]/', $query, $matches );
 
         if ( count ( $args ) !== $placeholders ) {
+            wp_load_translations_early();
             _doing_it_wrong( 'wpdb::prepare',
                 sprintf( __( 'The query does not contain the correct number of placeholders (%d) for the number of arguments passed (%d).' ),