From 04a0e21734b196da29b633f39a96cef9cabdd99d Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Mon, 9 Feb 2015 01:26:29 +0000 Subject: [PATCH] WPDB: The `mysqli_query()` call in `wpdb::set_charset()` had the parameters the wrong way around. Built from https://develop.svn.wordpress.org/trunk@31374 git-svn-id: http://core.svn.wordpress.org/trunk@31355 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/version.php | 2 +- wp-includes/wp-db.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/version.php b/wp-includes/version.php index 59c01ea130..dd051d1fbc 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31373'; +$wp_version = '4.2-alpha-31374'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index f31e5caa67..c8f456ef63 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -764,7 +764,7 @@ class wpdb { $query = $this->prepare( 'SET NAMES %s', $charset ); if ( ! empty( $collate ) ) $query .= $this->prepare( ' COLLATE %s', $collate ); - mysqli_query( $query, $dbh ); + mysqli_query( $dbh, $query ); } } else { if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset' ) ) {