Changeset 2025 for trunk/bp-core/bp-core-activation.php

Timestamp:

10/02/2009 10:07:58 PM (15 years ago)

Author:

apeatling

Message:

Fixing registration and avatar bugs with old 1.0 themes in 1.1.

File:

• trunk/bp-core/bp-core-activation.php (modified) (2 diffs)

trunk/bp-core/bp-core-activation.php

@@ -5 +5 @@
     
     if ( BP_ACTIVATION_SLUG != $bp->current_component )
+        return false;
+        
+    /* If we are using a BuddyPress 1.0 theme ignore this. */
+    if ( file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
         return false;
         
@@ -68 +72 @@
     }
     
-    bp_core_load_template( 'registration/activate' );
+    if ( '' != locate_template( array( 'registration/activate' ), false ) )
+        bp_core_load_template( apply_filters( 'bp_core_template_activate', 'activate' ) );      
+    else
+        bp_core_load_template( apply_filters( 'bp_core_template_activate', 'registration/activate' ) );     
 }
 add_action( 'wp', 'bp_core_screen_activation', 3 );