sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Database: Fall back to `utf8` when `utf8mb4` isn't supported. 

Sometimes, `DB_CHARSET` will be set to `utf8mb4`, even if the current setup doesn't support `utf8mb4`. After [38442], this can cause significant character set failures, causing the connection to fall back to `latin1`.

Instead of doing this, we now check that the connection supports `utf8mb4` before trying to use it, and fall back to `utf8` when we need to.

Fixes #37982 for trunk.


git-svn-id: https://develop.svn.wordpress.org/trunk@38580 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast 2016-09-08 23:48:05 +00:00
parent d651c9c90e
commit bafd8c92f2
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wp-includes/wp-db.php
View File

@ -779,6 +779,11 @@ class wpdb {
$charset = 'utf8mb4';
}
if ( 'utf8mb4' === $charset && ! $this->has_cap( 'utf8mb4' ) ) {
$charset = 'utf8';
$collate = str_replace( 'utf8mb4_', 'utf8_', $collate );
}
if ( 'utf8mb4' === $charset ) {
// _general_ is outdated, so we can upgrade it to _unicode_, instead.
if ( ! $collate || 'utf8_general_ci' === $collate ) {

19
tests/phpunit/tests/db.php
View File

@ -1031,4 +1031,23 @@ class Tests_DB extends WP_UnitTestCase {
$this->assertSame( 'utf8mb4_swedish_ci', $result['collate'] );
}
/**
* @ticket 37982
*/
function test_charset_switched_to_utf8() {
global $wpdb;
if ( $wpdb->has_cap( 'utf8mb4' ) ) {
$this->markTestSkipped( 'This test requires utf8mb4 to not be supported.' );
}
$charset = 'utf8mb4';
$collate = 'utf8mb4_general_ci';
$result = $wpdb->determine_charset( $charset, $collate );
$this->assertSame( 'utf8', $result['charset'] );
$this->assertSame( 'utf8_general_ci', $result['collate'] );
}
}