Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-12 13:44:21 +01:00
Code Issues Projects Releases Wiki Activity

Introduce wpdb::get_charset_collate() to return the DEFAULT CHARACTER SET and COLLATE for use in table schemas.

Browse Source 
props simonwheatley, pento. fixes #18451.



git-svn-id: http://core.svn.wordpress.org/trunk@21471 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-08-08 06:13:48 +00:00
parent 73c74cf8f7
commit 4e5fd4de46
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,12 +17,7 @@ global $wpdb, $wp_queries, $charset_collate;
* @global string * @global string
* @name $charset_collate * @name $charset_collate
*/ */
$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";
/** /**
* Retrieve the SQL for creating database tables. * Retrieve the SQL for creating database tables.

18
wp-includes/wp-db.php
View File

@ -1559,6 +1559,24 @@ class wpdb {
return $this->has_cap( 'collation' ); return $this->has_cap( 'collation' );
} }
/**
* The database character collate.
*
* @since 3.5.0
*
* @return string The database character collate.
*/
public function get_charset_collate() {
$charset_collate = '';
if ( ! empty( $this->charset ) )
$charset_collate = "DEFAULT CHARACTER SET $this->charset";
if ( ! empty( $this->collate ) )
$charset_collate .= " COLLATE $this->collate";
return $charset_collate;
}
/** /**
* Determine if a database supports a particular feature * Determine if a database supports a particular feature
* *