Changeset 10902
- Timestamp:
- 06/23/2016 03:03:04 PM (8 years ago)
- Location:
- trunk/src
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bp-core/admin/bp-core-admin-schema.php
r10825 r10902 12 12 13 13 /** 14 * Get the DB schema to use for BuddyPress components.15 *16 * @since 1.1.017 *18 * @global $wpdb $wpdb19 *20 * @return string The default database character-set, if set.21 */22 function bp_core_set_charset() {23 global $wpdb;24 25 require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );26 27 return !empty( $wpdb->charset ) ? "DEFAULT CHARACTER SET {$wpdb->charset}" : '';28 }29 30 /**31 14 * Main installer. 32 15 * … … 94 77 function bp_core_install_notifications() { 95 78 $sql = array(); 96 $charset_collate = bp_core_set_charset();79 $charset_collate = $GLOBALS['wpdb']->get_charset_collate(); 97 80 $bp_prefix = bp_core_get_table_prefix(); 98 81 … … 135 118 function bp_core_install_activity_streams() { 136 119 $sql = array(); 137 $charset_collate = bp_core_set_charset();120 $charset_collate = $GLOBALS['wpdb']->get_charset_collate(); 138 121 $bp_prefix = bp_core_get_table_prefix(); 139 122 … … 185 168 function bp_core_install_friends() { 186 169 $sql = array(); 187 $charset_collate = bp_core_set_charset();170 $charset_collate = $GLOBALS['wpdb']->get_charset_collate(); 188 171 $bp_prefix = bp_core_get_table_prefix(); 189 172 … … 210 193 function bp_core_install_groups() { 211 194 $sql = array(); 212 $charset_collate = bp_core_set_charset();195 $charset_collate = $GLOBALS['wpdb']->get_charset_collate(); 213 196 $bp_prefix = bp_core_get_table_prefix(); 214 197 … … 267 250 function bp_core_install_private_messaging() { 268 251 $sql = array(); 269 $charset_collate = bp_core_set_charset();252 $charset_collate = $GLOBALS['wpdb']->get_charset_collate(); 270 253 $bp_prefix = bp_core_get_table_prefix(); 271 254 … … 326 309 327 310 $sql = array(); 328 $charset_collate = bp_core_set_charset();311 $charset_collate = $GLOBALS['wpdb']->get_charset_collate(); 329 312 $bp_prefix = bp_core_get_table_prefix(); 330 313 … … 411 394 function bp_core_install_blog_tracking() { 412 395 $sql = array(); 413 $charset_collate = bp_core_set_charset();396 $charset_collate = $GLOBALS['wpdb']->get_charset_collate(); 414 397 $bp_prefix = bp_core_get_table_prefix(); 415 398 -
trunk/src/bp-core/bp-core-update.php
r10899 r10902 192 192 ) ); 193 193 194 require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); 194 195 require_once( buddypress()->plugin_dir . '/bp-core/admin/bp-core-admin-schema.php' ); 195 196 $switched_to_root_blog = false; -
trunk/src/bp-loader.php
r10901 r10902 523 523 require( $this->plugin_dir . 'bp-core/deprecated/2.5.php' ); 524 524 require( $this->plugin_dir . 'bp-core/deprecated/2.6.php' ); 525 require( $this->plugin_dir . 'bp-core/deprecated/2.7.php' ); 525 526 } 526 527 }
Note: See TracChangeset
for help on using the changeset viewer.