Ticket #18451: charset-collate.diff

wp-includes/wp-db.php

@@ -1557 +1557 @@
         }
 
         /**
+         * The database character collate.
+         *
+         * @since 3.5.0
+         *
+         * @return string The database character collate.
+         **/
+        public function charset_collate() {
+                $charset_collate = '';
+                
+                if ( ! empty( $this->charset ) )
+                        $charset_collate = "DEFAULT CHARACTER SET $this->charset";
+                if ( ! empty( $this->collate ) )
+                        $charset_collate .= " COLLATE $this->collate";
+                
+                return $charset_collate;
+        }
+
+        /**
          * Determine if a database supports a particular feature
          *
          * @since 2.7.0

wp-admin/includes/schema.php

@@ -17 +17 @@
  * @global string
  * @name $charset_collate
  */
-$charset_collate = '';
+$charset_collate = $wpdb->charset_collate();
 
-if ( ! empty( $wpdb->charset ) )
-        $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-if ( ! empty( $wpdb->collate ) )
-        $charset_collate .= " COLLATE $wpdb->collate";
-
 /**
  * Retrieve the SQL for creating database tables.
  *