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.5 branch.


Built from https://develop.svn.wordpress.org/branches/4.5@41487


git-svn-id: http://core.svn.wordpress.org/branches/4.5@41320 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Aaron Campbell 2017-09-19 16:23:33 +00:00
parent 644434666e
commit 4b09915583
1 changed files with 1 additions and 1 deletions

View File

@ -1261,7 +1261,7 @@ class wpdb {
} }
foreach ( $args as $arg ) { 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.5.10' ); _doing_it_wrong( 'wpdb::prepare', sprintf( 'Unsupported value type (%s).', gettype( $arg ) ), '4.5.10' );
} }
} }