Ticket #2580: includes_upgrade.patch

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

@@ -2 +2 @@
 function bp_core_set_charset() {
         global $wpdb;
 
-        require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
         /* BuddyPress component DB schema */
         if ( !empty($wpdb->charset) )

bp-forums/bp-forums-bbpress.php

@@ -65 +65 @@
 
         /* This must be loaded before functionss.bb-admin.php otherwise we get a function conflict. */
         if ( !$tables_installed = (boolean) $bbdb->get_results( 'DESCRIBE `' . $bbdb->forums . '`;', ARRAY_A ) )
-                require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
+                require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
         require_once( BB_PATH . 'bb-admin/includes/functions.bb-admin.php' );