Skip to:
Content

BuddyPress.org

Changeset 1184


Ignore:
Timestamp:
03/09/2009 06:24:00 PM (15 years ago)
Author:
apeatling
Message:

Fixes #531

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-core/bp-core-activation.php

    r1138 r1184  
    4848               
    4949                <?php
    50                 if( $signup->domain . $signup->path == '' ) {
    51                     printf(__('<p class="lead-in">Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of "%2$s".  Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.</p>', 'buddypress' ), 'http://' . $current_site->domain . $current_site->path . '/wp-login.php?redirect_to=' . $current_site->domain, $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . '/wp-login.php?action=lostpassword');
    52                 } else {
    53                     printf(__('<p class="lead-in">Your blog at <a href="%1$s">%2$s</a> is active. You may now login to your blog using your chosen username of "%3$s".  Please check your email inbox at %4$s for your password and login instructions.  If you do not receive an email, please check your junk or spam folder.  If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.</p>', 'buddypress' ), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . '/wp-login.php?action=lostpassword');
    54                 }
     50                printf(__('<p class="lead-in">Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of "%2$s".  Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.</p>', 'buddypress' ), site_url( '/wp-login.php?redirect_to=' . site_url() ), $signup->user_email, site_url( '/wp-login.php?action=lostpassword' ) );
     51           
    5552            } else {
    5653                ?>
     
    6259            extract($result);
    6360
    64             $url = get_blogaddress_by_id( (int) $blog_id);
    6561            $user = new WP_User( (int) $user_id);
    6662           
     
    6965            <h3><?php _e('Your account is now active!', 'buddypress' ); ?></h3>
    7066           
    71             <?php if( $url != site_url() ) : ?>
    72                 <p class="view"><?php printf(__('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Login</a>', 'buddypress' ), $url, $url . 'wp-login.php?redirect_to=' . $current_site->domain ); ?></p>
    73             <?php else: ?>
    74                 <p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.', 'buddypress' ), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?redirect_to=' . $current_site->domain, 'http://' . $current_site->domain . $current_site->path ); ?></p>
    75             <?php endif; ?>
     67            <p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.', 'buddypress' ), site_url( 'wp-login.php?redirect_to=' . site_url() ), site_url() ); ?></p>
    7668           
    7769            <div class="field-box" id="signup-welcome">
Note: See TracChangeset for help on using the changeset viewer.