Index: src/bp-blogs/bp-blogs-template.php
===================================================================
--- src/bp-blogs/bp-blogs-template.php
+++ src/bp-blogs/bp-blogs-template.php
@@ -1077,7 +1077,7 @@
if ( !is_subdomain_install() )
echo '' . $current_site->domain . $current_site->path . '
';
else
- echo ' .' . bp_blogs_get_subdomain_base() . '
';
+ echo ' .' . bp_signup_get_subdomain_base() . '
';
if ( !is_user_logged_in() ) {
print '(' . __( 'Your address will be ' , 'buddypress');
Index: src/bp-core/bp-core-adminbar.php
===================================================================
--- src/bp-core/bp-core-adminbar.php
+++ src/bp-core/bp-core-adminbar.php
@@ -67,6 +67,11 @@
if ( ! bp_use_wp_admin_bar() ) {
_doing_it_wrong( __FUNCTION__, __( 'The BuddyBar is no longer supported. Please migrate to the WordPress toolbar as soon as possible.', 'buddypress' ), '2.1.0' );
+ // Load deprecated code if not available.
+ if ( ! function_exists( 'bp_core_admin_bar' ) ) {
+ require buddypress()->plugin_dir . 'bp-core/deprecated/2.1.php';
+ }
+
// Keep the WP Toolbar from loading.
show_admin_bar( false );
Index: src/bp-core/classes/class-bp-admin.php
===================================================================
--- src/bp-core/classes/class-bp-admin.php
+++ src/bp-core/classes/class-bp-admin.php
@@ -382,6 +382,11 @@
// Only show 'switch to Toolbar' option if the user chose to retain the BuddyBar during the 1.6 upgrade.
if ( (bool) bp_get_option( '_bp_force_buddybar', false ) ) {
+ // Load deprecated code if not available.
+ if ( ! function_exists( 'bp_admin_setting_callback_force_buddybar' ) ) {
+ require buddypress()->plugin_dir . 'bp-core/deprecated/2.1.php';
+ }
+
add_settings_field( '_bp_force_buddybar', __( 'Toolbar', 'buddypress' ), 'bp_admin_setting_callback_force_buddybar', 'buddypress', 'bp_main' );
register_setting( 'buddypress', '_bp_force_buddybar', 'bp_admin_sanitize_callback_force_buddybar' );
}