From 25d21238214e0a08c2d939040e0902d128883527 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Mon, 23 May 2016 06:38:27 +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. Built from https://develop.svn.wordpress.org/trunk@37524 git-svn-id: http://core.svn.wordpress.org/trunk@37492 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/schema.php | 7 +------ wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index 075a6b41ab..f30bb10946 100644 --- a/wp-admin/includes/schema.php +++ b/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 ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 2c9097133b..0d5c8fe1ac 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37523'; +$wp_version = '4.6-alpha-37524'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.