Skip to:
Content

BuddyPress.org

Changeset 6662


Ignore:
Timestamp:
12/25/2012 09:21:34 AM (11 years ago)
Author:
johnjamesjacoby
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-templates/bp-legacy/buddypress/members/activate.php

    r6401 r6662  
    55    <div class="page" id="activate-page">
    66
     7        <?php do_action( 'template_notices' ); ?>
     8
     9        <?php do_action( 'bp_before_activate_content' ); ?>
     10
    711        <?php if ( bp_account_was_activated() ) : ?>
    8 
    9             <?php do_action( 'bp_before_activate_content' ); ?>
    1012
    1113            <?php if ( isset( $_GET['e'] ) ) : ?>
     
    1618
    1719        <?php else : ?>
    18 
    19             <?php do_action( 'bp_before_activate_content' ); ?>
    2020
    2121            <p><?php _e( 'Please provide a valid activation key.', 'buddypress' ); ?></p>
  • trunk/bp-themes/bp-default/registration/activate.php

    r5737 r6662  
    88        <div class="page" id="activate-page">
    99
     10            <h3><?php if ( bp_account_was_activated() ) :
     11                _e( 'Account Activated', 'buddypress' );
     12            else :
     13                _e( 'Activate your Account', 'buddypress' );
     14            endif; ?></h3>
     15
     16            <?php do_action( 'template_notices' ); ?>
     17
     18            <?php do_action( 'bp_before_activate_content' ); ?>
     19
    1020            <?php if ( bp_account_was_activated() ) : ?>
    11 
    12                 <h2 class="widgettitle"><?php _e( 'Account Activated', 'buddypress' ); ?></h2>
    13 
    14                 <?php do_action( 'bp_before_activate_content' ); ?>
    1521
    1622                <?php if ( isset( $_GET['e'] ) ) : ?>
     
    2127
    2228            <?php else : ?>
    23 
    24                 <h3><?php _e( 'Activate your Account', 'buddypress' ); ?></h3>
    25 
    26                 <?php do_action( 'bp_before_activate_content' ); ?>
    2729
    2830                <p><?php _e( 'Please provide a valid activation key.', 'buddypress' ); ?></p>
Note: See TracChangeset for help on using the changeset viewer.