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


Built from https://develop.svn.wordpress.org/branches/4.1@41491


git-svn-id: http://core.svn.wordpress.org/branches/4.1@41324 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Aaron Campbell 2017-09-19 16:26:18 +00:00
parent 688d186ddd
commit 68b9288c14
1 changed files with 1 additions and 1 deletions

View File

@ -1212,7 +1212,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.1.19' ); _doing_it_wrong( 'wpdb::prepare', sprintf( 'Unsupported value type (%s).', gettype( $arg ) ), '4.1.19' );
} }
} }