Changeset 37524 for trunk

Timestamp:

05/23/2016 06:37:53 AM (9 years ago)

Author:

pento

Message:

Database: Remove some duplicate code.

schema.php was manually defining the character set/collation query, instead of using wpdb::get_charset_collate().

Props sudar.

Fixes #35756.

File:

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

trunk/src/wp-admin/includes/schema.php

@@ -37 +37 @@
     global $wpdb;
 
-    $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();
 
     if ( $blog_id && $blog_id != $wpdb->blogid )