From 448896a2c70ea268c87c2bfc94413586874b1098 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Mon, 23 May 2016 06:37:53 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@37524 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/schema.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/wp-admin/includes/schema.php b/src/wp-admin/includes/schema.php index 075a6b41ab..f30bb10946 100644 --- a/src/wp-admin/includes/schema.php +++ b/src/wp-admin/includes/schema.php @@ -36,12 +36,7 @@ $charset_collate = $wpdb->get_charset_collate(); function wp_get_db_schema( $scope = 'all', $blog_id = null ) { 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 ) $old_blog_id = $wpdb->set_blog_id( $blog_id );