WordPress 4.6.2

[autoinstalls/wordpress.git] / wp-includes / wp-db.php

diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 8ebee4c40e2042a5b279e24a0fd03d40fad06a3a..8057bcc04e7aa2df533283ea471d02491da19faf 100644 (file)
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -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 ) {