Ticket #35756: 35756.patch

src/wp-admin/includes/schema.php

@@ -36 +36 @@
 function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
         global $wpdb;
 
-        $charset_collate = '';
+        $charset_collate = $wpdb->get_charset_collate();
 
-        if ( ! empty($wpdb->charset) )
-                $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-        if ( ! empty($wpdb->collate) )
-                $charset_collate .= " COLLATE $wpdb->collate";
-
         if ( $blog_id && $blog_id != $wpdb->blogid )
                 $old_blog_id = $wpdb->set_blog_id( $blog_id );