Merge remote-tracking branch 'origin/master' into latest

README.md

@@ -1,7 +1,7 @@
 Project Nami
 ===============
 
-###Version: `0.9.17`###
+###Version: `0.9.18`###
 
 ###Description:###
 

license.txt

@@ -1,4 +1,4 @@
-Project Nami - Web publishing software for the Windows Azure platform
+WordPress - Web publishing software
 
 Copyright 2014 by the contributors
 
@@ -30,22 +30,11 @@ permission notices:
 and
 
   WordPress - Web publishing software
-  http://wordpress.org
 
-  Copyright 2003-2014 by the contributors
+  Copyright 2003-2010 by the contributors
 
   WordPress is released under the GPL
 
-and
-
-  Project Nami - Web publishing software for the Windows Azure platform 
-  http://projectnami.org
-
-  Copyright 2013-2014 by the contributors
-
-  Project Nami is released under the GPL
-
-
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
                     GNU GENERAL PUBLIC LICENSE
@@ -391,6 +380,6 @@ Public License instead of this License.
 WRITTEN OFFER
 
 The source code for any program binaries or compressed scripts that are
-included with Project Nami can be freely obtained at the following URL:
+included with WordPress can be freely obtained at the following URL:
 
-	https://github.com/ProjectNami/projectnami
+	https://wordpress.org/download/source/

wp-activate.php

@@ -84,7 +84,7 @@ function wpmu_activate_stylesheet() {
 	<?php } else {
 
 		$key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
-		$result = wpmu_activate_signup($key);
+		$result = wpmu_activate_signup( $key );
 		if ( is_wp_error($result) ) {
 			if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
 			    $signup = $result->get_error_data();
@@ -105,18 +105,17 @@ function wpmu_activate_stylesheet() {
 			    echo '<p>'.$result->get_error_message().'</p>';
 			}
 		} else {
-			extract($result);
-			$url = get_blogaddress_by_id( (int) $blog_id);
-			$user = get_userdata( (int) $user_id);
+			$url = isset( $result['blog_id'] ) ? get_blogaddress_by_id( (int) $result['blog_id'] ) : '';
+			$user = get_userdata( (int) $result['user_id'] );
 			?>
 			<h2><?php _e('Your account is now active!'); ?></h2>
 
 			<div id="signup-welcome">
 				<p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
-				<p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $password; ?></p>
+				<p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p>
 			</div>
 
-			<?php if ( $url != network_home_url('', 'http') ) : ?>
+			<?php if ( $url && $url != network_home_url( '', 'http' ) ) : ?>
 				<p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>'), $url, $url . 'wp-login.php' ); ?></p>
 			<?php else: ?>
 				<p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url('wp-login.php', 'login'), network_home_url() ); ?></p>
@@ -129,4 +128,4 @@ function wpmu_activate_stylesheet() {
 	var key_input = document.getElementById('key');
 	key_input && key_input.focus();
 </script>
-<?php get_footer(); ?>
+<?php get_footer();