Permalink
Browse files

Coding style cleanups

git-svn-id: http://svn.automattic.com/wordpress/trunk@12734 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 6da55f7 commit f9a92c258877e6f0c48ad8bc0cb2c3dcdf184b64 ryan committed Jan 15, 2010
Showing with 71 additions and 86 deletions.
  1. +3 −3 wp-activate.php
  2. +61 −74 wp-app.php
  3. +2 −4 wp-includes/load.php
  4. +5 −5 wp-settings.php
View
@@ -7,7 +7,7 @@
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 @@ function wpmu_activate_stylesheet() {
?>
<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 @@ function wpmu_activate_stylesheet() {
<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>
Oops, something went wrong.

0 comments on commit f9a92c2

Please sign in to comment.