Avoid conflicts with other plugins and weird configurations.

stuttter · Mar 16, 2017 · 3b12b37 · 3b12b37
1 parent 0f19743
commit 3b12b37
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/wp-site-aliases.php b/wp-site-aliases.php
@@ -48,9 +48,21 @@ function _wp_site_aliases() {
 
 	// Single-site shims
 	if ( ! is_multisite() ) {
-		require_once ABSPATH . WPINC . '/ms-blogs.php';
-		require_once ABSPATH . WPINC . '/class-wp-site.php';
-		require_once ABSPATH . WPINC . '/class-wp-network.php';
+
+		// Avoid BuddyPress abstraction conflicts
+		if ( ! function_exists( 'update_blog_status' ) ) {
+			require_once ABSPATH . WPINC . '/ms-blogs.php';
+		}
+
+		// Make sure class isn't already shimmed
+		if ( ! class_exists( 'WP_Site' ) ) {
+			require_once ABSPATH . WPINC . '/class-wp-site.php';
+		}
+
+		// Make sure class isn't already shimmed
+		if ( ! class_exists( 'WP_Network' ) ) {
+			require_once ABSPATH . WPINC . '/class-wp-network.php';
+		}
 	}
 
 	// Tables