Changeset 10902 for trunk/src/bp-core/admin/bp-core-admin-schema.php

Timestamp:

06/23/2016 03:03:04 PM (10 years ago)

Author:

djpaul

Message:

Explicitly set database collation type when installing BuddyPress.

Fixes #7117, props kitsunesolar

File:

• trunk/src/bp-core/admin/bp-core-admin-schema.php (modified) (8 diffs)

trunk/src/bp-core/admin/bp-core-admin-schema.php

@@ -12 +12 @@
 
 /**
- * Get the DB schema to use for BuddyPress components.
- *
- * @since 1.1.0
- *
- * @global $wpdb $wpdb
- *
- * @return string The default database character-set, if set.
- */
-function bp_core_set_charset() {
-        global $wpdb;
-
-        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-
-        return !empty( $wpdb->charset ) ? "DEFAULT CHARACTER SET {$wpdb->charset}" : '';
-}
-
-/**
  * Main installer.
  *
@@ -94 +77 @@
 function bp_core_install_notifications() {
         $sql             = array();
-        $charset_collate = bp_core_set_charset();
+        $charset_collate = $GLOBALS['wpdb']->get_charset_collate();
         $bp_prefix       = bp_core_get_table_prefix();
 
@@ -135 +118 @@
 function bp_core_install_activity_streams() {
         $sql             = array();
-        $charset_collate = bp_core_set_charset();
+        $charset_collate = $GLOBALS['wpdb']->get_charset_collate();
         $bp_prefix       = bp_core_get_table_prefix();
 
@@ -185 +168 @@
 function bp_core_install_friends() {
         $sql             = array();
-        $charset_collate = bp_core_set_charset();
+        $charset_collate = $GLOBALS['wpdb']->get_charset_collate();
         $bp_prefix       = bp_core_get_table_prefix();
 
@@ -210 +193 @@
 function bp_core_install_groups() {
         $sql             = array();
-        $charset_collate = bp_core_set_charset();
+        $charset_collate = $GLOBALS['wpdb']->get_charset_collate();
         $bp_prefix       = bp_core_get_table_prefix();
 
@@ -267 +250 @@
 function bp_core_install_private_messaging() {
         $sql             = array();
-        $charset_collate = bp_core_set_charset();
+        $charset_collate = $GLOBALS['wpdb']->get_charset_collate();
         $bp_prefix       = bp_core_get_table_prefix();
 
@@ -326 +309 @@
 
         $sql             = array();
-        $charset_collate = bp_core_set_charset();
+        $charset_collate = $GLOBALS['wpdb']->get_charset_collate();
         $bp_prefix       = bp_core_get_table_prefix();
 
@@ -411 +394 @@
 function bp_core_install_blog_tracking() {
         $sql             = array();
-        $charset_collate = bp_core_set_charset();
+        $charset_collate = $GLOBALS['wpdb']->get_charset_collate();
         $bp_prefix       = bp_core_get_table_prefix();