Changeset 38581 for branches/4.6

Timestamp:

09/08/2016 11:53:25 PM (8 years ago)

Author:

pento

Message:

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.

Merge of [38580] to the 4.6 branch.
Fixes #37982.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-includes/wp-db.php (modified) (1 diff)
• tests/phpunit/tests/db.php (modified) (1 diff)

branches/4.6/src/wp-includes/wp-db.php

@@ -778 +778 @@
         if ( 'utf8' === $charset && $this->has_cap( 'utf8mb4' ) ) {
             $charset = 'utf8mb4';
+        }
+
+        if ( 'utf8mb4' === $charset && ! $this->has_cap( 'utf8mb4' ) ) {
+            $charset = 'utf8';
+            $collate = str_replace( 'utf8mb4_', 'utf8_', $collate );
         }
 

branches/4.6/tests/phpunit/tests/db.php

@@ -1030 +1030 @@
         $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'] );
+    }
 }