Changeset 21471 for trunk/wp-admin/includes/schema.php

Timestamp:

08/08/2012 06:13:48 AM (14 years ago)

Author:

nacin

Message:

Introduce wpdb::get_charset_collate() to return the DEFAULT CHARACTER SET and COLLATE for use in table schemas.

props simonwheatley, pento. fixes #18451.

File:

• trunk/wp-admin/includes/schema.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -18 +18 @@
  * @name $charset_collate
  */
-$charset_collate = '';
-
-if ( ! empty( $wpdb->charset ) )
-    $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-if ( ! empty( $wpdb->collate ) )
-    $charset_collate .= " COLLATE $wpdb->collate";
+$charset_collate = $wpdb->get_charset_collate();
 
 /**