From 739a20a659fffd6b0313e9c74c5a709ff44ff4c2 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Tue, 18 Nov 2014 03:38:23 +0000
Subject: [PATCH] WPDB: When a `db.php` drop-in is being used, and it doesn't
 explicitly define itself as connecting to MySQL, skip the character set
 checks. This ensures that existing drop-ins won't accidentally run checks
 that they don't support.

See #21212.

Built from https://develop.svn.wordpress.org/trunk@30375


git-svn-id: http://core.svn.wordpress.org/trunk@30372 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/wp-db.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index e297152092..924ea5dcc0 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -2211,7 +2211,7 @@ class wpdb {
 		$this->col_meta[ $table ] = $columns;
 
 		foreach ( $columns as $column ) {
-			if ( $column->Collation ) {
+			if ( ! empty( $column->Collation ) ) {
 				list( $charset ) = explode( '_', $column->Collation );
 				$charsets[ strtolower( $charset ) ] = true;
 			}
@@ -2237,7 +2237,7 @@ class wpdb {
 			$charset = key( $charsets );
 		} elseif ( 0 === $count ) {
 			// No charsets, assume this table can store whatever.
-			$charset = 'latin1';
+			$charset = false;
 		} else {
 			// More than one charset. Remove latin1 if present and recalculate.
 			unset( $charsets['latin1'] );
@@ -2291,6 +2291,11 @@ class wpdb {
 			return $charset;
 		}
 
+		// Skip this entirely if this isn't a MySQL database.
+		if ( false === $this->is_mysql ) {
+			return false;
+		}
+
 		if ( empty( $this->table_charset[ $table ] ) ) {
 			// This primes column information for us.
 			$table_charset = $this->get_table_charset( $table );
@@ -2378,13 +2383,12 @@ class wpdb {
 		foreach ( $data as &$value ) {
 			$charset = $value['charset'];
 
-			// latin1 will happily store anything.
-			if ( 'latin1' === $charset ) {
+			// Column isn't a string, or is latin1, which will will happily store anything.
+			if ( false === $charset || 'latin1' === $charset ) {
 				continue;
 			}
 
-			// Column or value isn't a string.
-			if ( false === $charset || ! is_string( $value['value'] ) ) {
+			if ( ! is_string( $value['value'] ) ) {
 				continue;
 			}