WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Gary Pendergast 2016-05-23 06:38:27 +00:00
parent db3917d491
commit 25d2123821
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-admin/includes/schema.php
View File

@ -36,12 +36,7 @@ $charset_collate = $wpdb->get_charset_collate();
function wp_get_db_schema( $scope = 'all', $blog_id = null ) { function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
global $wpdb; global $wpdb;
$charset_collate = ''; $charset_collate = $wpdb->get_charset_collate();
if ( ! empty($wpdb->charset) )
$charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
if ( ! empty($wpdb->collate) )
$charset_collate .= " COLLATE $wpdb->collate";
if ( $blog_id && $blog_id != $wpdb->blogid ) if ( $blog_id && $blog_id != $wpdb->blogid )
$old_blog_id = $wpdb->set_blog_id( $blog_id ); $old_blog_id = $wpdb->set_blog_id( $blog_id );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.