Changeset 6662 for trunk/bp-themes/bp-default/registration/activate.php

Timestamp:

12/25/2012 09:21:34 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Make sure notices appear in activation templates. Props magnus78. Fixes #4725.

File:

• trunk/bp-themes/bp-default/registration/activate.php (modified) (2 diffs)

trunk/bp-themes/bp-default/registration/activate.php

@@ -8 +8 @@
         <div class="page" id="activate-page">
 
+            <h3><?php if ( bp_account_was_activated() ) :
+                _e( 'Account Activated', 'buddypress' );
+            else :
+                _e( 'Activate your Account', 'buddypress' );
+            endif; ?></h3>
+
+            <?php do_action( 'template_notices' ); ?>
+
+            <?php do_action( 'bp_before_activate_content' ); ?>
+
             <?php if ( bp_account_was_activated() ) : ?>
-
-                <h2 class="widgettitle"><?php _e( 'Account Activated', 'buddypress' ); ?></h2>
-
-                <?php do_action( 'bp_before_activate_content' ); ?>
 
                 <?php if ( isset( $_GET['e'] ) ) : ?>
@@ -21 +27 @@
 
             <?php else : ?>
-
-                <h3><?php _e( 'Activate your Account', 'buddypress' ); ?></h3>
-
-                <?php do_action( 'bp_before_activate_content' ); ?>
 
                 <p><?php _e( 'Please provide a valid activation key.', 'buddypress' ); ?></p>