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.


Built from https://develop.svn.wordpress.org/branches/4.6@41486


git-svn-id: http://core.svn.wordpress.org/branches/4.6@41319 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Aaron Campbell 2017-09-19 16:21:34 +00:00
parent 22f3d4e600
commit ce78b2a4fb

View File

@ -1305,7 +1305,7 @@ class wpdb {
}
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' );
}
}