WordPress.org

Make WordPress Core

Changeset 37524


Ignore:
Timestamp:
05/23/2016 06:37:53 AM (3 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/schema.php

    r37488 r37524  
    3737    global $wpdb;
    3838
    39     $charset_collate = '';
    40 
    41     if ( ! empty($wpdb->charset) )
    42         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
    43     if ( ! empty($wpdb->collate) )
    44         $charset_collate .= " COLLATE $wpdb->collate";
     39    $charset_collate = $wpdb->get_charset_collate();
    4540
    4641    if ( $blog_id && $blog_id != $wpdb->blogid )
Note: See TracChangeset for help on using the changeset viewer.