WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Gary Pendergast 2015-02-09 01:26:29 +00:00
parent d568679946
commit 04a0e21734
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

2
wp-includes/wp-db.php
View File

@ -764,7 +764,7 @@ class wpdb {
$query = $this->prepare( 'SET NAMES %s', $charset ); $query = $this->prepare( 'SET NAMES %s', $charset );
if ( ! empty( $collate ) ) if ( ! empty( $collate ) )
$query .= $this->prepare( ' COLLATE %s', $collate ); $query .= $this->prepare( ' COLLATE %s', $collate );
mysqli_query( $query, $dbh ); mysqli_query( $dbh, $query );
} }
} else { } else {
if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset' ) ) { if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset' ) ) {