Use the ->get_charset_collate() function for retrieving the database charset and collate

Author: sheabunge

Diff for: php/class-db.php

@@ -115,21 +115,11 @@ function create_tables( $upgrade = false ) {
 	 * @uses dbDelta() to apply the SQL code
 	 *
 	 * @param string $table_name The name of the table to create
+	 * @return bool whether the table creation was successful
 	 */
 	function create_table( $table_name ) {
 		global $wpdb;
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
-
-		/* Set the database charset */
-		$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();
 
 		/* Create the database table */
 		$sql = "CREATE TABLE $table_name (
@@ -143,6 +133,7 @@ function create_table( $table_name ) {
 				PRIMARY KEY  (id)
 			) $charset_collate;";
 
+		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 		dbDelta( $sql );
 		do_action( 'code_snippets/create_table', $table_name );
 	}