diff wordpress-3.9.6/readme.html wordpress-4.2.2/readme.html
12c12
< 	 Version 3.9.6
---
> 	 Version 4.2.2
52c52
< <p>WordPress can <a href="http://codex.wordpress.org/Importing_Content">import from a number of systems</a>. First you need to get WordPress installed and working as described above, before using <a href="wp-admin/import.php" title="Import to WordPress">our import tools</a>.</p>
---
> <p>WordPress can <a href="https://codex.wordpress.org/Importing_Content">import from a number of systems</a>. First you need to get WordPress installed and working as described above, before using <a href="wp-admin/import.php" title="Import to WordPress">our import tools</a>.</p>
60c60
< <h2>System Recommendations</h2>
---
> <h2>Recommendations</h2>
61a62,63
>
<li><a href="http://php.net/">PHP</a> version <strong>5.4</strong> or higher.</li>
>
<li><a href="http://www.mysql.com/">MySQL</a> version <strong>5.5</strong> or higher.</li>
63c65
<
<li>A link to <a href="https://wordpress.org/">https://wordpress.org</a> on your site.</li>
---
>
<li>A link to <a href="https://wordpress.org/">wordpress.org</a> on your site.</li>
69c71
< 	<dt><a href="http://codex.wordpress.org/">The WordPress Codex</a></dt>
---
> 	<dt><a href="https://codex.wordpress.org/">The WordPress Codex</a></dt>
73c75
< 	<dt><a href="http://planet.wordpress.org/">WordPress Planet</a></dt>
---
> 	<dt><a href="https://planet.wordpress.org/">WordPress Planet</a></dt>
77c79
< 	<dt><a href="http://codex.wordpress.org/IRC">WordPress <abbr title="Internet Relay Chat">IRC</abbr> Channel</a></dt>
---
> 	<dt><a href="https://codex.wordpress.org/IRC">WordPress <abbr title="Internet Relay Chat">IRC</abbr> Channel</a></dt>
84c86
<
<li>WordPress has a robust plugin <abbr title="application programming interface">API</abbr> that makes extending the code easy. If you are a developer interested in utilizing this, see the <a href="http://codex.wordpress.org/Plugin_API" title="WordPress plugin API">plugin documentation in the Codex</a>. You shouldn’t modify any of the core code.</li>
---
>
<li>WordPress has a robust plugin <abbr title="application programming interface">API</abbr> that makes extending the code easy. If you are a developer interested in utilizing this, see the <a href="https://codex.wordpress.org/Plugin_API" title="WordPress plugin API">plugin documentation in the Codex</a>. You shouldn’t modify any of the core code.</li>
diff wordpress-3.9.6/wp-activate.php wordpress-4.2.2/wp-activate.php
87c87
< 		$result = wpmu_activate_signup($key);
---
> 		$result = wpmu_activate_signup( $key );
108,110c108,109
< 			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'] );
116c115
< 				<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>
119c118
< 			<?php if ( $url != network_home_url('', 'http') ) : ?>
---
> 			<?php if ( $url && $url != network_home_url( '', 'http' ) ) : ?>
132c131
< <?php get_footer(); ?>
---
> <?php get_footer();
Common subdirectories: wordpress-3.9.6/wp-admin and wordpress-4.2.2/wp-admin
diff wordpress-3.9.6/wp-comments-post.php wordpress-4.2.2/wp-comments-post.php
50c50
< 	wp_die( __('Sorry, comments are closed for this item.') );
---
> 	wp_die( __( 'Sorry, comments are closed for this item.' ), 403 );
114,115c114,116
< 	if ( get_option('comment_registration') || 'private' == $status )
< 		wp_die( __('Sorry, you must be logged in to post a comment.') );
---
> 	if ( get_option( 'comment_registration' ) || 'private' == $status ) {
> 		wp_die( __( 'Sorry, you must be logged in to post a comment.' ), 403 );
> 	}
121,124c122,126
< 	if ( 6 > strlen($comment_author_email) || '' == $comment_author )
< 		wp_die( __('<strong>ERROR</strong>: please fill the required fields (name, email).') );
< 	elseif ( !is_email($comment_author_email))
< 		wp_die( __('<strong>ERROR</strong>: please enter a valid email address.') );
---
> 	if ( 6 > strlen( $comment_author_email ) || '' == $comment_author ) {
> 		wp_die( __( '<strong>ERROR</strong>: please fill the required fields (name, email).' ), 200 );
> 	} elseif ( ! is_email( $comment_author_email ) ) {
> 		wp_die( __( '<strong>ERROR</strong>: please enter a valid email address.' ), 200 );
> 	}
127,128c129,131
< if ( '' == $comment_content )
< 	wp_die( __('<strong>ERROR</strong>: please type a comment.') );
---
> if ( '' == $comment_content ) {
> 	wp_die( __( '<strong>ERROR</strong>: please type a comment.' ), 200 );
> }
135c138,142
< $comment = get_comment($comment_id);
---
> if ( ! $comment_id ) {
> 	wp_die( __( "<strong>ERROR</strong>: The comment could not be saved. Please try again later." ) );
> }
>
> $comment = get_comment( $comment_id );
diff wordpress-3.9.6/wp-config-sample.php wordpress-4.2.2/wp-config-sample.php
6,8c6,8
<  * Secret Keys, WordPress Language, and ABSPATH. You can find more information
<  * by visiting {@link http://codex.wordpress.org/Editing_wp-config.php Editing
<  * wp-config.php} Codex page. You can get the MySQL settings from your web host.
---
>  * Secret Keys, and ABSPATH. You can find more information by visiting
>  * {@link https://codex.wordpress.org/Editing_wp-config.php Editing wp-config.php}
>  * Codex page. You can get the MySQL settings from your web host.
63,72d62
<
< /**
<  * WordPress Localized Language, defaults to English.
<  *
<  * Change this to localize WordPress. A corresponding MO file for the chosen
<  * language must be installed to wp-content/languages. For example, install
<  * de_DE.mo to wp-content/languages and set WPLANG to 'de_DE' to enable German
<  * language support.
<  */
< define('WPLANG', '');
Common subdirectories: wordpress-3.9.6/wp-content and wordpress-4.2.2/wp-content
diff wordpress-3.9.6/wp-cron.php wordpress-4.2.2/wp-cron.php
29c29,38
< // Uncached doing_cron transient fetch
---
> /**
>  * Retrieves the cron lock.
>  *
>  * Returns the uncached <code>doing_cron</code> transient.
>  *
>  * @ignore
>  * @since 3.3.0
>  *
>  * @return string|false Value of the <code>doing_cron</code> transient, 0|false otherwise.
>  */
35,36c44,47
< 		// Skip local cache and force refetch of doing_cron transient in case
< 		// another processs updated the cache
---
> 		/*
> 		 * Skip local cache and force re-fetch of doing_cron transient
> 		 * in case another process updated the cache.
> 		 */
94a106
> 			 * @ignore
98c110
< 			 * @param array $v['args'] The arguments to be passed to the hook.
---
> 			 * @param array  $args The arguments to be passed to the hook.
Common subdirectories: wordpress-3.9.6/wp-includes and wordpress-4.2.2/wp-includes
diff wordpress-3.9.6/wp-load.php wordpress-4.2.2/wp-load.php
25a26,33
> /*
>  * If wp-config.php exists in the WordPress root, or if it exists in the root and wp-settings.php
>  * doesn't, load wp-config.php. The secondary check for wp-settings.php has the added benefit
>  * of avoiding cases where the current directory is a nested installation, e.g. / is WordPress(a)
>  * and /blog/ is WordPress(b).
>  *
>  * If neither set of conditions is true, initiate loading the setup process.
>  */
41d48
< 	define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
43,46d49
< 	require_once( ABSPATH . WPINC . '/version.php' );
<
< 	wp_check_php_mysql_versions();
< 	wp_load_translations_early();
54a58,73
> 	/*
> 	 * We're going to redirect to setup-config.php. While this shouldn't result
> 	 * in an infinite loop, that's a silly thing to assume, don't you think? If
> 	 * we're traveling in circles, our last-ditch effort is "Need more help?"
> 	 */
> 	if ( false === strpos( $_SERVER['REQUEST_URI'], 'setup-config' ) ) {
> 		header( 'Location: ' . $path );
> 		exit;
> 	}
>
> 	define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
> 	require_once( ABSPATH . WPINC . '/version.php' );
>
> 	wp_check_php_mysql_versions();
> 	wp_load_translations_early();
>
57c76
< 	$die .= '<p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>';
---
> 	$die .= '<p>' . __( "Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>';
diff wordpress-3.9.6/wp-login.php wordpress-4.2.2/wp-login.php
28,31c28,31
<  * @param string $title    Optional. WordPress Log In Page title to display in <title/> element. Default 'Log In'.
<  * @param string $message  Optional. Message to display in header. Default empty.
<  * @param string $wp_error Optional. The error to pass. Default empty.
<  * @param WP_Error $wp_error Optional. WordPress Error Object
---
>  * @param string   $title    Optional. WordPress login Page title to display in the <code><title></code> element.
>  *                           Default 'Log In'.
>  * @param string   $message  Optional. Message to display in header. Default empty.
>  * @param WP_Error $wp_error Optional. The error to pass. Default empty.
73,75c73,77
< 	// Remove all stored post data on logging out.
< 	// This could be added by add_action('login_head'...) like wp_shake_js()
< 	// but maybe better if it's not removable by plugins
---
> 	/*
> 	 * Remove all stored post data on logging out.
> 	 * This could be added by add_action('login_head'...) like wp_shake_js(),
> 	 * but maybe better if it's not removable by plugins
> 	 */
150c152
< 		<h1><a>" title="<?php echo esc_attr( $login_header_title ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
---
> 		<h1><a>" title="<?php echo esc_attr( $login_header_title ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
176,177c178,179
< 			$severity
 = $wp_error->get_error_data($code);
< 			foreach ( $wp_error->get_error_messages($code) as $error ) {
---
> 			$severity = $wp_error->get_error_data( $code );
> 			foreach ( $wp_error->get_error_messages( $code ) as $error_message ) {
179c181
< 					$messages .= '	' . $error . "\n";
---
> 					$messages .= '	' . $error_message . "\n";
181c183
< 					$errors .= '	' . $error . "\n";
---
> 					$errors .= '	' . $error_message . "\n";
265c267,268
<  * @uses $wpdb WordPress Database object
---
>  * @global wpdb         $wpdb      WordPress database abstraction object.
>  * @global PasswordHash $wp_hasher Portable PHP password hashing framework.
276c279
< 	} else if ( strpos( $_POST['user_login'], '@' ) ) {
---
> 	} elseif ( strpos( $_POST['user_login'], '@' ) ) {
300c303
< 	// redefining user_login ensures we return the right case in the email
---
> 	// Redefining user_login ensures we return the right case in the email.
312a316
>
332,334c336,338
< 	if ( ! $allow )
< 		return new WP_Error('no_password_reset', __('Password reset is not allowed for this user'));
< 	else if ( is_wp_error($allow) )
---
> 	if ( ! $allow ) {
> 		return new WP_Error( 'no_password_reset', __('Password reset is not allowed for this user') );
> 	} elseif ( is_wp_error( $allow ) ) {
335a340
> 	}
352c357
< 		require_once ABSPATH . 'wp-includes/class-phpass.php';
---
> 		require_once ABSPATH . WPINC . '/class-phpass.php';
368,369c373,376
< 		// The blogname option is escaped with esc_html on the way into the database in sanitize_option
< 		// we want to reverse this for the plain text arena of emails.
---
> 		/*
> 		 * The blogname option is escaped with esc_html on the way into the database
> 		 * in sanitize_option we want to reverse this for the plain text arena of emails.
> 		 */
381a389
>
385a394
> 	 * @since 4.1.0 Added <code>$user_login</code> and <code>$user_data</code> parameters.
387,388c396,399
< 	 * @param string $message Default mail message.
< 	 * @param string $key     The activation key.
---
> 	 * @param string  $message    Default mail message.
> 	 * @param string  $key        The activation key.
> 	 * @param string  $user_login The username for the user.
> 	 * @param WP_User $user_data  WP_User object.
390c401
< 	$message = apply_filters( 'retrieve_password_message', $message, $key );
---
> 	$message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data );
426c437,438
< setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);
---
> $secure = ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) && 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
> setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
428c440
< 	setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);
---
> 	setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
439c451
<  * The dynamic portion of the hook name, $action, refers to the action
---
>  * The dynamic portion of the hook name, <code>$action</code>, refers to the action
453c465
< 	require_once ABSPATH . 'wp-includes/class-phpass.php';
---
> 	require_once ABSPATH . WPINC . '/class-phpass.php';
467c479,480
< 	setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH );
---
> 	$secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
> 	setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );
472,473d484
< break;
<
475a487,489
>
> 	$user = wp_get_current_user();
>
478c492,508
< 	$redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?loggedout=true';
---
> 	if ( ! empty( $_REQUEST['redirect_to'] ) ) {
> 		$redirect_to = $requested_redirect_to = $_REQUEST['redirect_to'];
> 	} else {
> 		$redirect_to = 'wp-login.php?loggedout=true';
> 		$requested_redirect_to = '';
> 	}
>
> 	/**
> 	 * Filter the log out redirect URL.
> 	 *
> 	 * @since 4.2.0
> 	 *
> 	 * @param string  $redirect_to           The redirect destination URL.
> 	 * @param string  $requested_redirect_to The requested redirect destination URL passed as a parameter.
> 	 * @param WP_User $user                  The WP_User object for the user that's logging out.
> 	 */
> 	$redirect_to = apply_filters( 'logout_redirect', $redirect_to, $requested_redirect_to, $user );
482,483d511
< break;
<
533c561
< 	 * Fires inside the lostpassword <form> tags, before the hidden fields.
---
> 	 * Fires inside the lostpassword form tags, before the hidden fields.
547,553c575,576
< 	/**
< 	 * Filter the registration URL below the login form.
< 	 *
< 	 * @since 1.5.0
< 	 *
< 	 * @param string $registration_url Registration URL.
< 	 */
---
>
> 	/** This filter is documented in wp-includes/general-template.php */
635,636c658
< 	<p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ & ).'); ?></p>
<
---
> 	<p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
658c680,681
< 	/** This filter is documented in wp-login.php */
---
>
> 	/** This filter is documented in wp-includes/general-template.php */
670d692
< 		$sign_up_url = network_site_url( 'wp-signup.php' );
678c700
< 		wp_redirect( apply_filters( 'wp_signup_location', $sign_up_url ) );
---
> 		wp_redirect( apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ) );
712c734
< <form name="registerform" id="registerform" action="<?php echo esc_url( site_url('wp-login.php?action=register', 'login_post') ); ?>" method="post">
---
> <form name="registerform" id="registerform" action="<?php echo esc_url( site_url('wp-login.php?action=register', 'login_post') ); ?>" method="post" novalidate="novalidate">
719c741
< 		<input type="text" name="user_email" id="user_email" class="input" value="<?php echo esc_attr(wp_unslash($user_email)); ?>" size="25" /></label>
---
> 		<input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" /></label>
773,778d794
< 	// If the user was redirected to a secure login form from a non-secure admin page, and secure login is required but secure admin is not, then don't use a secure
< 	// cookie and redirect back to the referring non-secure admin page. This allows logins to always be POSTed over SSL while allowing the user to choose visiting
< 	// the admin via http or https.
< 	if ( !$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) )
< 		$secure_cookie = false;
<
784c800
< 				__( 'http://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) );
---
> 				__( 'https://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) );
788c804
< 				__( 'http://codex.wordpress.org/Cookies' ) ) );
---
> 				__( 'https://codex.wordpress.org/Cookies' ) ) );
854c870
< 			$errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to experience the awesomeness.' ), 'message' );
---
> 			$errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what’s new.' ), 'message' );
875a892,897
>
> 	if ( ! empty( $errors->errors ) ) {
> 		$aria_describedby_error = ' aria-describedby="login_error"';
> 	} else {
> 		$aria_describedby_error = '';
> 	}
881c903
< 		<input type="text" name="log" id="user_login" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label>
---
> 		<input type="text" name="log" id="user_login"<?php echo $aria_describedby_error; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" /></label>
885c907
< 		<input type="password" name="pwd" id="user_pass" class="input" value="" size="20" /></label>
---
> 		<input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby_error; ?> class="input" value="" size="20" /></label>
915c937,938
< 		/** This filter is documented in wp-login.php */
---
>
> 		/** This filter is documented in wp-includes/general-template.php */
927c950
< <?php if ( $user_login || $interim_login ) { ?>
---
> <?php if ( $user_login ) { ?>
diff wordpress-3.9.6/wp-mail.php wordpress-4.2.2/wp-mail.php
71c71
< 		// body signal
---
> 		// Body signal.
111,112c111,114
< 			// Set the author using the email address (From or Reply-To, the last used)
< 			// otherwise use the site admin
---
> 			/*
> 			 * Set the author using the email address (From or Reply-To, the last used)
> 			 * otherwise use the site admin.
> 			 */
174c176,177
< 		// match case-insensitive content-transfer-encoding
---
>
> 		// Match case-insensitive content-transfer-encoding.
diff wordpress-3.9.6/wp-settings.php wordpress-4.2.2/wp-settings.php
121a122
> require( ABSPATH . WPINC . '/session.php' );
194c195
< // Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().
---
> // Define constants after multisite is loaded.
369c370
<  * @link http://codex.wordpress.org/AJAX_in_Plugins
---
>  * @link https://codex.wordpress.org/AJAX_in_Plugins
diff wordpress-3.9.6/wp-signup.php wordpress-4.2.2/wp-signup.php
22c22
< 	 * Fires within the <head> section of the site sign-up screen.
---
> 	 * Fires within the head section of the site sign-up screen.
156,157d155
<  * @uses wp_get_current_user() to retrieve the current user
<  * @uses wpmu_validate_blog_signup() to validate new site signup for the current user
191c189
< 	<input name="user_email" type="text" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><?php _e('We send your registration email
 to this address. (Double-check your email address before continuing.)') ?>
---
> 	<input name="user_email" type="email" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><?php _e('We send your registration email to this address. (Double-check your email address before continuing.)') ?>
211d208
<  * @uses wpmu_validate_user_signup() to retrieve an array of user data
223d219
<  * @uses wp_get_current_user() to get the current user
306,309c302,303
<  * @uses wp_get_current_user() to retrieve the current user
<  * @uses wpmu_create_blog() to add a new site
<  * @uses confirm_another_blog_signup() to confirm the user's new site signup
<  * @return bool True if blog signup was validated, false if error
---
>  * @return null|boolean True if blog signup was validated, false if error.
>  *                      The function halts all execution if the user is not logged in.
314c308
< 	if ( !is_user_logged_in() )
---
> 	if ( ! is_user_logged_in() ) {
315a310
> 	}
318c313,319
< 	extract($result);
---
>
> 	// Extracted values set/overwrite globals.
> 	$domain = $result['domain'];
> 	$path = $result['path'];
> 	$blogname = $result['blogname'];
> 	$blog_title = $result['blog_title'];
> 	$errors = $result['errors'];
340c341
< 	$meta = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults );
---
> 	$meta_defaults = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults );
353c354
< 	$meta = apply_filters( 'add_signup_meta', $meta );
---
> 	$meta = apply_filters( 'add_signup_meta', $meta_defaults );
391,392d391
<  * @uses apply_filters() filter $filtered_results
<  * @uses show_user_form() to display the user registration form
432c431
< 	<form id="setupform" method="post" action="wp-signup.php">
---
> 	<form id="setupform" method="post" action="wp-signup.php" novalidate="novalidate">
464,466d462
<  * @uses validate_user_form() to retrieve an array of the user data
<  * @uses wpmu_signup_user() to signup the new user
<  * @uses confirm_user_signup() to confirm the new user signup
471c467,469
< 	extract($result);
---
> 	$user_name = $result['user_name'];
> 	$user_email = $result['user_email'];
> 	$errors = $result['errors'];
514,515d511
<  * @uses apply_filters() to filter $filtered_results
<  * @uses show_blog_form() to display the blog signup form
579,583d574
<  * @uses wpmu_validate_user_signup() to retrieve an array of the new user data and errors
<  * @uses wpmu_validate_blog_signup() to retrieve an array of the new site data and errors
<  * @uses apply_filters() to make signup $meta filterable
<  * @uses signup_user() to signup a new user
<  * @uses signup_blog() to signup a the new user to a new site
588,589c579,582
< 	$result = wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']);
< 	extract($result);
---
> 	$user_result = wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] );
> 	$user_name = $user_result['user_name'];
> 	$user_email = $user_result['user_email'];
> 	$user_errors = $user_result['errors'];
591,592c584,585
< 	if ( $errors->get_error_code() ) {
< 		signup_user($user_name, $user_email, $errors);
---
> 	if ( $user_errors->get_error_code() ) {
> 		signup_user( $user_name, $user_email, $user_errors );
596,597c589,594
< 	$result = wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title']);
< 	extract($result);
---
> 	$result = wpmu_validate_blog_signup( $_POST['blogname'], $_POST['blog_title'] );
> 	$domain = $result['domain'];
> 	$path = $result['path'];
> 	$blogname = $result['blogname'];
> 	$blog_title = $result['blog_title'];
> 	$errors = $result['errors'];
605c602
< 	$meta = array ('lang_id' => 1, 'public' => $public);
---
> 	$signup_meta = array ('lang_id' => 1, 'public' => $public);
608c605
< 	$meta = apply_filters( 'add_signup_meta', $meta );
---
> 	$meta = apply_filters( 'add_signup_meta', $signup_meta );
diff wordpress-3.9.6/wp-trackback.php wordpress-4.2.2/wp-trackback.php
23,25c23,25
<  * @param int|bool $error         Whether there was an error.
<  *                                Default '0'. Accepts '0' or '1'.
<  * @param string   $error_message Error message if an error occurred.
---
>  * @param mixed  $error         Whether there was an error.
>  *                              Default '0'. Accepts '0' or '1', true or false.
>  * @param string $error_message Error message if an error occurred.