Ticket #2350: patch-2350.patch

bp-core/bp-core-templatetags.php

@@ -959 +959 @@
         }
 
 function bp_has_custom_activation_page() {
-        if ( locate_template( array( 'activate.php' ), false ) || locate_template( array( '/registration/activate.php' ), false ) )
+        global $wpdb;
+
+        $activation_pages = array( 'activate.php', '/registration/activate.php' );
+
+        if ( bp_core_is_multisite() && $wpdb->blogid != BP_ROOT_BLOG ) {
+                $original_blog = $wpdb->blogid;
+                switch_to_blog( BP_ROOT_BLOG );
+
+                foreach ( $activation_pages as $page ) {
+                        if ( file_exists( get_stylesheet_directory() . '/' . $page ) )
+                                return true;
+                        else if ( file_exists( get_template_directory() . '/' . $page ) )
+                                return true;
+                }
+
+                switch_to_blog( $original_blog );
+        }
+
+        if ( locate_template( $activation_pages, false ) )
                 return true;
 
         return false;