Merge pull request #6 from lacimarsik/lm/wordpress-update-4.9.8

Wordpress update 4.9.8
lacimarsik · Aug 23, 2018 · 167d799 · 167d799
2 parents 842211f + d7d9522
commit 167d799
Show file tree

Hide file tree

Showing 1,047 changed files with 221,256 additions and 66,062 deletions.
diff --git a/index.php b/index.php
@@ -1,24 +1,17 @@
 <?php
+/**
+ * Front to the WordPress application. This file doesn't do anything, but loads
+ * wp-blog-header.php which does and tells WordPress to load the theme.
+ *
+ * @package WordPress
+ */
 
-if (isset($_POST['cashier']) || isset($_POST['results'])) {
-	include 'wp-content/themes/Parallax-One/cashier_app/cashier_app.php';
-} else {
+/**
+ * Tells WordPress to load the WordPress theme and output it.
+ *
+ * @var bool
+ */
+define('WP_USE_THEMES', true);
 
-	/**
-	 * Front to the WordPress application. This file doesn't do anything, but loads
-	 * wp-blog-header.php which does and tells WordPress to load the theme.
-	 *
-	 * @package WordPress
-	 */
-
-	/**
-	 * Tells WordPress to load the WordPress theme and output it.
-	 *
-	 * @var bool
-	 */
-	define('WP_USE_THEMES', true);
-
-	/** Loads the WordPress Environment and Template */
-	require(dirname(__FILE__) . '/wp-blog-header.php');
-
-}
+/** Loads the WordPress Environment and Template */
+require( dirname( __FILE__ ) . '/wp-blog-header.php' );
diff --git a/wp-activate.php b/wp-activate.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Confirms that the activation key that is sent in an email after a user signs
- * up for a new blog matches the key for that user and then displays confirmation.
+ * up for a new site matches the key for that user and then displays confirmation.
  *
  * @package WordPress
  */
@@ -18,6 +18,8 @@
 	die();
 }
 
+nocache_headers();
+
 if ( is_object( $wp_object_cache ) )
 	$wp_object_cache->cache_enabled = false;
 
@@ -32,13 +34,17 @@
 do_action( 'activate_header' );
 
 /**
- * Adds an action hook specific to this page that fires on wp_head
+ * Adds an action hook specific to this page.
+ *
+ * Fires on {@see 'wp_head'}.
  *
- * @since MU
+ * @since MU (3.0.0)
  */
 function do_activate_header() {
-    /**
-     * Fires before the Site Activation page is loaded, but on the wp_head action.
+	/**
+	 * Fires before the Site Activation page is loaded.
+	 *
+	 * Fires on the {@see 'wp_head'} action.
      *
      * @since 3.0.0
      */
@@ -49,7 +55,7 @@ function do_activate_header() {
 /**
  * Loads styles specific to this page.
  *
- * @since MU
+ * @since MU (3.0.0)
  */
 function wpmu_activate_stylesheet() {
 	?>
@@ -88,25 +94,39 @@ function wpmu_activate_stylesheet() {
 		$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();
+				$signup = $result->get_error_data();
 				?>
 				<h2><?php _e('Your account is now active!'); ?></h2>
 				<?php
 				echo '<p class="lead-in">';
 				if ( $signup->domain . $signup->path == '' ) {
-					printf( __('Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. 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>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, wp_lostpassword_url() );
+					printf(
+						/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
+						__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. 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>.' ),
+						network_site_url( 'wp-login.php', 'login' ),
+						$signup->user_login,
+						$signup->user_email,
+						wp_lostpassword_url()
+					);
 				} else {
-					printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. 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>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, wp_lostpassword_url() );
+					printf(
+						/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
+						__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. 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>.' ),
+						sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
+						$signup->user_login,
+						$signup->user_email,
+						wp_lostpassword_url()
+					);
 				}
 				echo '</p>';
 			} else {
 				?>
-				<h2><?php _e('An error occurred during the activation'); ?></h2>
+				<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
+				<p><?php echo $result->get_error_message(); ?></p>
 				<?php
-			    echo '<p>'.$result->get_error_message().'</p>';
 			}
 		} else {
-			$url = isset( $result['blog_id'] ) ? get_blogaddress_by_id( (int) $result['blog_id'] ) : '';
+			$url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
 			$user = get_userdata( (int) $result['user_id'] );
 			?>
 			<h2><?php _e('Your account is now active!'); ?></h2>
@@ -117,13 +137,19 @@ function wpmu_activate_stylesheet() {
 			</div>
 
 			<?php if ( $url && $url != network_home_url( '', 'http' ) ) :
-				switch_to_blog( (int) $result['blog_id'] ); 
-				$login_url = wp_login_url(); 
-				restore_current_blog(); 
+				switch_to_blog( (int) $result['blog_id'] );
+				$login_url = wp_login_url();
+				restore_current_blog();
 				?>
-				<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, esc_url( $login_url ) ); ?></p>
+				<p class="view"><?php
+					/* translators: 1: site URL, 2: login URL */
+					printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
+				?></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>
+				<p class="view"><?php
+					/* translators: 1: login URL, 2: network home URL */
+					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>
 			<?php endif;
 		}
 	}