diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index 066e851fa3..43ff528c7f 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -1254,9 +1254,18 @@ class wpdb { $args = func_get_args(); array_shift( $args ); + // If args were passed as an array (as in vsprintf), move them up - if ( isset( $args[0] ) && is_array($args[0]) ) + if ( is_array( $args[0] ) && count( $args ) == 1 ) { $args = $args[0]; + } + + foreach ( $args as $arg ) { + if ( ! is_scalar( $arg ) ) { + _doing_it_wrong( 'wpdb::prepare', sprintf( 'Unsupported value type (%s).', gettype( $arg ) ), '4.5.10' ); + } + } + $query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it $query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting $query = preg_replace( '|(?