vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-16 23:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Coding style cleanups

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@12734 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2010-01-15 22:25:40 +00:00
parent 8ef8b7bad5
commit 3dfc463062
4 changed files with 70 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-activate.php
+3 -3
View File
@@ -7,7 +7,7 @@ require( dirname(__FILE__) . '/wp-load.php' );
require( 'wp-blog-header.php' );
require_once( ABSPATH . WPINC . '/registration.php');
if( is_object( $wp_object_cache ) )
if ( is_object( $wp_object_cache ) )
$wp_object_cache->cache_enabled = false;
do_action("activate_header");
@@ -52,7 +52,7 @@ get_header();
?>
<h2><?php _e('Your account is now active!'); ?></h2>
<?php
if( $signup->domain . $signup->path == '' ) {
if ( $signup->domain . $signup->path == '' ) {
printf(__('<p class="lead-in">Your account has been activated. You may now <a href="%1$s">login</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>'), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
} else {
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>'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
@@ -75,7 +75,7 @@ get_header();
<p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $password; ?></p>
</div>
<?php if( $url != 'http://' . $current_site->domain . $current_site->path ) : ?>
<?php if ( $url != 'http://' . $current_site->domain . $current_site->path ) : ?>
<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>'), $url, $url . 'wp-login.php' ); ?></p>
<?php else: ?>
<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>.' ), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', 'http://' . $current_site->domain . $current_site->path ); ?></p>