mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-23 01:27:36 +01:00
Database: Obey locale-specific utf8
collation settings.
Some sites prefer to use locale-specific location settings. For example, the Swedish WordPress package use `utf8_swedish_ci`, instead of `utf8_unicode_ci`. When upgrading the connection to `utf8mb4`, we were overriding this to be `utf8mb4_unicode_ci`, instead of maintaining the use of the `_swedish_ci` variant. The locale-specific collations do have extra collation rules just for that language, so it's useful to maintain compatibility. Fixes #32405. Built from https://develop.svn.wordpress.org/trunk@37521 git-svn-id: http://core.svn.wordpress.org/trunk@37489 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
116102089f
commit
1aff99307f
@ -4,7 +4,7 @@
|
|||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '4.6-alpha-37520';
|
$wp_version = '4.6-alpha-37521';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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.
|
||||||
|
@ -757,8 +757,13 @@ class wpdb {
|
|||||||
$this->charset = 'utf8mb4';
|
$this->charset = 'utf8mb4';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( 'utf8mb4' === $this->charset && ( ! $this->collate || stripos( $this->collate, 'utf8_' ) === 0 ) ) {
|
if ( 'utf8mb4' === $this->charset ) {
|
||||||
$this->collate = 'utf8mb4_unicode_ci';
|
// _general_ is outdated, so we can upgrade it to _unicode_, instead.
|
||||||
|
if ( ! $this->collate || 'utf8_general_ci' === $this->collate ) {
|
||||||
|
$this->collate = 'utf8mb4_unicode_ci';
|
||||||
|
} else {
|
||||||
|
$this->collate = str_replace( 'utf8_', 'utf8mb4_', $this->collate );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user