Changeset 41486 for branches/4.6/src/wp-includes/wp-db.php

Timestamp:

09/19/2017 04:19:49 PM (9 years ago)

Author:

aaroncampbell

Message:

Database: Don’t trigger _doing_it_wrong() for null values in wpdb::prepare().

While wpdb::prepare() does not support null values (see #12819) they still appear in the wild like in the WordPress Importer and other plugins.

Merges [41483] to 4.6 branch.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-includes/wp-db.php (modified) (1 diff)

branches/4.6/src/wp-includes/wp-db.php

@@ -1306 +1306 @@
 
         foreach ( $args as $arg ) {
-            if ( ! is_scalar( $arg ) ) {
+            if ( ! is_scalar( $arg ) && ! is_null( $arg ) ) {
                 _doing_it_wrong( 'wpdb::prepare', sprintf( 'Unsupported value type (%s).', gettype( $arg ) ), '4.6.7' );
             }