Tag 3.9.4.

Built from https://develop.svn.wordpress.org/@32252 git-svn-id: http://core.svn.wordpress.org/tags/3.9.4@32223 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 16:11:53 +00:00
22 changed files with 148 additions and 1005 deletions
--- a/readme.html
+++ b/readme.html
@@ -9,7 +9,7 @@
 <body>
 <h1 id="logo">
 	<a href="https://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
-	<br /> Version 3.9.8
+	<br /> Version 3.9.4
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>

--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -39,38 +39,22 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 </h2>

 <div class="changelog point-releases">
-	<h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 8 ); ?></h3>
-	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.', 2 ), '3.9.8', number_format_i18n( 2 ) ); ?>
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.8' ); ?>
-	</p>
-	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
-         '<strong>Version %1$s</strong> addressed some security issues.', 2 ), '3.9.7' ); ?>
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.7' ); ?>
- 	</p>
-	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.', 3 ), '3.9.6', number_format_i18n( 3 ) ); ?>
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.6' ); ?>
-	</p>
-	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed %2$s bugs.', 1 ), '3.9.5', number_format_i18n( 1 ) ); ?>
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.5' ); ?>
- 	</p>
+	<h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 4 ); ?></h3>
 	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
         '<strong>Version %1$s</strong> addressed some security issues.', 8 ), '3.9.4' ); ?>
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.4' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.9.4' ); ?>
 	</p>
 	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
         '<strong>Version %1$s</strong> addressed some security issues.', 9 ), '3.9.3', number_format_i18n( 9 ) ); ?>
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.3' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.9.3' ); ?>
 	</p>
 	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
         '<strong>Version %1$s</strong> addressed some security issues.', 6 ), '3.9.2', number_format_i18n( 6 ) ); ?>
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.2' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.9.2' ); ?>
 	</p>
 	<p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
         '<strong>Version %1$s</strong> addressed %2$s bugs.', 34 ), '3.9.1', number_format_i18n( 34 ) ); ?>
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.9.1' ); ?>
+		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.9.1' ); ?>
 	</p>
 </div>

--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -429,10 +429,6 @@ function wp_network_dashboard_right_now() {
 function wp_dashboard_quick_press( $error_msg = false ) {
 	global $post_ID;

-	if ( ! current_user_can( 'edit_posts' ) ) {
-		return;
-	}
-
 	/* Check if a new auto-draft (= no new post_ID) is needed or if the old can be used */
 	$last_post_id = (int) get_user_option( 'dashboard_quick_press_last_post_id' ); // Get the last post_ID
 	if ( $last_post_id ) {
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -1469,7 +1469,7 @@ function _admin_notice_post_locked() {
 		// Allow plugins to prevent some users overriding the post lock
 		if ( $override ) {
 			?>
-			<a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', wp_nonce_url( get_edit_post_link( $post->ID, 'url' ), 'lock-post_' . $post->ID ) ) ); ?>"><?php _e('Take over'); ?></a>
+			<a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', get_edit_post_link( $post->ID, 'url' ) ) ); ?>"><?php _e('Take over'); ?></a>
 			<?php
 		}

--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -1011,9 +1011,6 @@ function update_core($from, $to) {
 		$wp_filesystem->delete($old_file, true);
 	}

-	// Remove any Genericons example.html's from the filesystem
-	_upgrade_422_remove_genericons();
-
 	// Upgrade DB with separate request
 	/** This filter is documented in wp-admin/includes/update-core.php */
 	apply_filters( 'update_feedback', __( 'Upgrading database&#8230;' ) );
@@ -1149,68 +1146,3 @@ window.location = 'about.php?updated';
 	exit();
 }
 add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
-
-/**
- * Cleans up Genericons example files.
- *
- * @since 4.2.2
- */
-function _upgrade_422_remove_genericons() {
-	global $wp_theme_directories, $wp_filesystem;
-
-	// A list of the affected files using the filesystem absolute paths.
-	$affected_files = array();
-
-	// Themes
-	foreach ( $wp_theme_directories as $directory ) {
-		$directory = trailingslashit( $directory );
-		$affected_theme_files = _upgrade_422_find_genericons_files_in_folder( $directory );
-		$affected_files = array_merge( $affected_files, $affected_theme_files );
-	}
-
-	// Plugins
-	$plugin_dir = trailingslashit( WP_PLUGIN_DIR );
-	$affected_plugin_files = _upgrade_422_find_genericons_files_in_folder( $plugin_dir );
-	$affected_files = array_merge( $affected_files, $affected_plugin_files );
-
-	foreach ( $affected_files as $file ) {
-		$gen_dir = $wp_filesystem->find_folder( dirname( $file ) . '/' );
-		if ( ! $gen_dir ) {
-			continue;
-		}
-		// The path when the file is accessed via WP_Filesystem may differ in the case of FTP
-		$remote_file = $gen_dir . basename( $file );
-
-		if ( ! $wp_filesystem->exists( $remote_file ) ) {
-			continue;
-		}
-
-		if ( ! $wp_filesystem->delete( $remote_file, false, 'f' ) ) {
-			$wp_filesystem->put_contents( $remote_file, '' );
-		}
-	}
-}
-
-/**
- * Recursively find Genericons example files in a given folder.
- *
- * @ignore
- * @since 4.2.2
- *
- * @param string $directory Directory path. Expects trailingslashed.
- * @return array
- */
-function _upgrade_422_find_genericons_files_in_folder( $directory ) {
-
-	$files = array();
-	if ( file_exists( "{$directory}example.html" ) && false !== strpos( file_get_contents( "{$directory}example.html" ), '<title>Genericons</title>' ) ) {
-		$files[] = substr( "{$directory}example.html", strlen( $base ) );
-	}
-
-	foreach ( glob( $directory . '*', GLOB_ONLYDIR ) as $dir ) {
-		$dir = trailingslashit( $dir );
-		$files = array_merge( $files, _upgrade_422_find_genericons_files_in_folder( $dir ) );
-	}
-
-	return $files;
-}
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -430,9 +430,6 @@ function upgrade_all() {
 	if ( $wp_current_db_version < 26691 )
 		upgrade_380();

-	if ( $wp_current_db_version < 27918 )
-		upgrade_397();
-
 	maybe_disable_link_manager();

 	maybe_disable_automattic_widgets();
@@ -1273,63 +1270,6 @@ function upgrade_380() {
 		deactivate_plugins( array( 'mp6/mp6.php' ), true );
 	}
 }
-
-/**
- * Execute changes made in WordPress 3.9.6.
- *
- * @since 3.9.6
- */
-function upgrade_396() {
-}
-
-/**
- * Execute changes made in WordPress 3.9.7.
- *
- * @since 3.9.7
- */
-function upgrade_397() {
-	global $wp_current_db_version, $wpdb;
-
-	if ( $wp_current_db_version < 27918 ) {
-		$content_length = $wpdb->get_col_length( $wpdb->comments, 'comment_content' );
-
-		if ( is_wp_error( $content_length ) ) {
-			return;
-		}
-
-		if ( false === $content_length ) {
-			$content_length = array(
-				'type'   => 'byte',
-				'length' => 65535,
-			);
-		} elseif ( ! is_array( $content_length ) ) {
-			$length = (int) $content_length > 0 ? (int) $content_length : 65535;
-			$content_length = array(
-				'type'	 => 'byte',
-				'length' => $length
-			);
-		}
-
-		if ( 'byte' !== $content_length['type'] || 0 === $content_length['length'] ) {
-			// Sites with malformed DB schemas are on their own.
-			return;
-		}
-
-		$allowed_length = intval( $content_length['length'] ) - 10;
-
-		$comments = $wpdb->get_results(
-			"SELECT `comment_ID` FROM `{$wpdb->comments}`
-				WHERE `comment_date_gmt` > '2015-04-26'
-				AND LENGTH( `comment_content` ) >= {$allowed_length}
-				AND ( `comment_content` LIKE '%<%' OR `comment_content` LIKE '%>%' )"
-		);
-
-		foreach ( $comments as $comment ) {
-			wp_delete_comment( $comment->comment_ID, true );
-		}
-	}
-}
-
 /**
 * Execute network level changes
 *
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -113,9 +113,8 @@ case 'post-quickdraft-save':
 	if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
 		$error_msg = __( 'Unable to submit this form, please refresh and try again.' );

-	if ( ! current_user_can( 'edit_posts' ) ) {
-		exit;
-	}
+	if ( ! current_user_can( 'edit_posts' ) )
+		$error_msg = __( 'Oops, you don&#8217;t have access to add new drafts.' );

 	if ( $error_msg )
 		return wp_dashboard_quick_press( $error_msg );
@@ -160,7 +159,6 @@ case 'edit':
 		wp_die( __( 'You can&#8217;t edit this item because it is in the Trash. Please restore it and try again.' ) );

 	if ( ! empty( $_GET['get-post-lock'] ) ) {
-		check_admin_referer( 'lock-post_' . $post_id );
 		wp_set_post_lock( $post_id );
 		wp_redirect( get_edit_post_link( $post_id, 'url' ) );
 		exit();
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -1100,10 +1100,8 @@ function map_meta_cap( $cap, $user_id ) {
 	case 'edit_post':
 	case 'edit_page':
 		$post = get_post( $args[0] );
-		if ( empty( $post ) ) {
-			$caps[] = 'do_not_allow';
+		if ( empty( $post ) )
 			break;
-		}

 		if ( 'revision' == $post->post_type ) {
 			$post = get_post( $post->post_parent );
--- a/wp-includes/class-wp-customize-widgets.php
+++ b/wp-includes/class-wp-customize-widgets.php
@@ -1163,7 +1163,7 @@ final class WP_Customize_Widgets {
 			return null;
 		}

-		if ( ! hash_equals( $this->get_instance_hash_key( $decoded ), $value['instance_hash_key'] ) ) {
+		if ( $this->get_instance_hash_key( $decoded ) !== $value['instance_hash_key'] ) {
 			return null;
 		}

--- a/wp-includes/class-wp-embed.php
+++ b/wp-includes/class-wp-embed.php
@@ -57,7 +57,7 @@ class WP_Embed {
 		add_shortcode( 'embed', array( $this, 'shortcode' ) );

 		// Do the shortcode (only the [embed] one is registered)
-		$content = do_shortcode( $content, true );
+		$content = do_shortcode( $content );

 		// Put the original shortcodes back
 		$shortcode_tags = $orig_shortcode_tags;
@@ -291,14 +291,7 @@ class WP_Embed {
 	 * @return string Potentially modified $content.
 	 */
 	function autoembed( $content ) {
-		// Replace line breaks from all HTML elements with placeholders.
-		$content = wp_replace_in_html_tags( $content, array( "\n" => '<!-- wp-line-break -->' ) );
-
-		// Find URLs that are on their own line.
-		$content = preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
-
-		// Put the line breaks back.
-		return str_replace( '<!-- wp-line-break -->', "\n", $content );
+		return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
 	}

 	/**
--- a/wp-includes/compat.php
+++ b/wp-includes/compat.php
@@ -13,141 +13,23 @@ if ( !function_exists('_') ) {
 	}
 }

-/**
- * Returns whether PCRE/u (PCRE_UTF8 modifier) is available for use.
- *
- * @ignore
- * @since 4.2.2
- * @access private
- *
- * @param bool $set - Used for testing only
- *             null   : default - get PCRE/u capability
- *             false  : Used for testing - return false for future calls to this function
- *             'reset': Used for testing - restore default behavior of this function
- */
-function _wp_can_use_pcre_u( $set = null ) {
-	static $utf8_pcre = 'reset';
-
-	if ( null !== $set ) {
-		$utf8_pcre = $set;
-	}
-
-	if ( 'reset' === $utf8_pcre ) {
-		$utf8_pcre = @preg_match( '/^./u', 'a' );
-	}
-
-	return $utf8_pcre;
-}
-
-if ( ! function_exists( 'mb_substr' ) ) :
-	function mb_substr( $str, $start, $length = null, $encoding = null ) {
-		return _mb_substr( $str, $start, $length, $encoding );
+if ( !function_exists('mb_substr') ):
+	function mb_substr( $str, $start, $length=null, $encoding=null ) {
+		return _mb_substr($str, $start, $length, $encoding);
 	}
 endif;

-/*
- * Only understands UTF-8 and 8bit.  All other character sets will be treated as 8bit.
- * For $encoding === UTF-8, the $str input is expected to be a valid UTF-8 byte sequence.
- * The behavior of this function for invalid inputs is undefined.
- */
-function _mb_substr( $str, $start, $length = null, $encoding = null ) {
-	if ( null === $encoding ) {
-		$encoding = get_option( 'blog_charset' );
+function _mb_substr( $str, $start, $length=null, $encoding=null ) {
+	// the solution below, works only for utf-8, so in case of a different
+	// charset, just use built-in substr
+	$charset = get_option( 'blog_charset' );
+	if ( !in_array( $charset, array('utf8', 'utf-8', 'UTF8', 'UTF-8') ) ) {
+		return is_null( $length )? substr( $str, $start ) : substr( $str, $start, $length);
 	}
-
-	// The solution below works only for UTF-8,
-	// so in case of a different charset just use built-in substr()
-	if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
-		return is_null( $length ) ? substr( $str, $start ) : substr( $str, $start, $length );
-	}
-
-	if ( _wp_can_use_pcre_u() ) {
-		// Use the regex unicode support to separate the UTF-8 characters into an array
-		preg_match_all( '/./us', $str, $match );
-		$chars = is_null( $length ) ? array_slice( $match[0], $start ) : array_slice( $match[0], $start, $length );
-		return implode( '', $chars );
-	}
-
-	$regex = '/(
-		  [\x00-\x7F]                  # single-byte sequences   0xxxxxxx
-		| [\xC2-\xDF][\x80-\xBF]       # double-byte sequences   110xxxxx 10xxxxxx
-		| \xE0[\xA0-\xBF][\x80-\xBF]   # triple-byte sequences   1110xxxx 10xxxxxx * 2
-		| [\xE1-\xEC][\x80-\xBF]{2}
-		| \xED[\x80-\x9F][\x80-\xBF]
-		| [\xEE-\xEF][\x80-\xBF]{2}
-		| \xF0[\x90-\xBF][\x80-\xBF]{2} # four-byte sequences   11110xxx 10xxxxxx * 3
-		| [\xF1-\xF3][\x80-\xBF]{3}
-		| \xF4[\x80-\x8F][\x80-\xBF]{2}
-	)/x';
-
-	$chars = array( '' ); // Start with 1 element instead of 0 since the first thing we do is pop
-	do {
-		// We had some string left over from the last round, but we counted it in that last round.
-		array_pop( $chars );
-
-		// Split by UTF-8 character, limit to 1000 characters (last array element will contain the rest of the string)
-		$pieces = preg_split( $regex, $str, 1000, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
-
-		$chars = array_merge( $chars, $pieces );
-	} while ( count( $pieces ) > 1 && $str = array_pop( $pieces ) ); // If there's anything left over, repeat the loop.
-
-	return join( '', array_slice( $chars, $start, $length ) );
-}
-
-if ( ! function_exists( 'mb_strlen' ) ) :
-	function mb_strlen( $str, $encoding = null ) {
-		return _mb_strlen( $str, $encoding );
-	}
-endif;
-
-/*
- * Only understands UTF-8 and 8bit.  All other character sets will be treated as 8bit.
- * For $encoding === UTF-8, the $str input is expected to be a valid UTF-8 byte sequence.
- * The behavior of this function for invalid inputs is undefined.
- */
-function _mb_strlen( $str, $encoding = null ) {
-	if ( null === $encoding ) {
-		$encoding = get_option( 'blog_charset' );
-	}
-
-	// The solution below works only for UTF-8,
-	// so in case of a different charset just use built-in strlen()
-	if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
-		return strlen( $str );
-	}
-
-	if ( _wp_can_use_pcre_u() ) {
-		// Use the regex unicode support to separate the UTF-8 characters into an array
-		preg_match_all( '/./us', $str, $match );
-		return count( $match[0] );
-	}
-
-	$regex = '/(?:
-		  [\x00-\x7F]                  # single-byte sequences   0xxxxxxx
-		| [\xC2-\xDF][\x80-\xBF]       # double-byte sequences   110xxxxx 10xxxxxx
-		| \xE0[\xA0-\xBF][\x80-\xBF]   # triple-byte sequences   1110xxxx 10xxxxxx * 2
-		| [\xE1-\xEC][\x80-\xBF]{2}
-		| \xED[\x80-\x9F][\x80-\xBF]
-		| [\xEE-\xEF][\x80-\xBF]{2}
-		| \xF0[\x90-\xBF][\x80-\xBF]{2} # four-byte sequences   11110xxx 10xxxxxx * 3
-		| [\xF1-\xF3][\x80-\xBF]{3}
-		| \xF4[\x80-\x8F][\x80-\xBF]{2}
-	)/x';
-
-	$count = 1; // Start at 1 instead of 0 since the first thing we do is decrement
-	do {
-		// We had some string left over from the last round, but we counted it in that last round.
-		$count--;
-
-		// Split by UTF-8 character, limit to 1000 characters (last array element will contain the rest of the string)
-		$pieces = preg_split( $regex, $str, 1000 );
-
-		// Increment
-		$count += count( $pieces );
-	} while ( $str = array_pop( $pieces ) ); // If there's anything left over, repeat the loop.
-
-	// Fencepost: preg_split() always returns one extra item in the array
-	return --$count;
+	// use the regex unicode support to separate the UTF-8 characters into an array
+	preg_match_all( '/./us', $str, $match );
+	$chars = is_null( $length )? array_slice( $match[0], $start ) : array_slice( $match[0], $start, $length );
+	return implode( '', $chars );
 }

 if ( !function_exists('hash_hmac') ):
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -1343,7 +1343,7 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 		?>
 		<p>
 			<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:') ?></label>
-			<input type="text" class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo esc_attr( $title ); ?>" />
+			<input type="text" class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo $title; ?>" />
 		</p>
 		<p>
 			<label for="<?php echo $this->get_field_id('nav_menu'); ?>"><?php _e('Select Menu:'); ?></label>
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -291,9 +291,6 @@ function wpautop($pee, $br = true) {
 	$pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
 	$pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines

-	// Find newlines in all elements and add placeholders.
-	$pee = wp_replace_in_html_tags( $pee, array( "\n" => " <!-- wpnl --> " ) );
-
 	if ( strpos( $pee, '</object>' ) !== false ) {
 		// no P/BR around param and embed
 		$pee = preg_replace( '|(<object[^>]*>)\s*|', '$1', $pee );
@@ -339,109 +336,9 @@ function wpautop($pee, $br = true) {
 	if ( !empty($pre_tags) )
 		$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);

-	// Restore newlines in all elements.
-	$pee = str_replace( " <!-- wpnl --> ", "\n", $pee );
-
 	return $pee;
 }

-/**
- * Separate HTML elements and comments from the text.
- *
- * @since 4.2.4
- *
- * @param string $input The text which has to be formatted.
- * @return array The formatted text.
- */
-function wp_html_split( $input ) {
-	static $regex;
-
-	if ( ! isset( $regex ) ) {
-		$comments =
-			  '!'           // Start of comment, after the <.
-			. '(?:'         // Unroll the loop: Consume everything until --> is found.
-			.     '-(?!->)' // Dash not followed by end of comment.
-			.     '[^\-]*+' // Consume non-dashes.
-			. ')*+'         // Loop possessively.
-			. '(?:-->)?';   // End of comment. If not found, match all input.
-
-		$cdata =
-			  '!\[CDATA\['  // Start of comment, after the <.
-			. '[^\]]*+'     // Consume non-].
-			. '(?:'         // Unroll the loop: Consume everything until ]]> is found.
-			.     '](?!]>)' // One ] not followed by end of comment.
-			.     '[^\]]*+' // Consume non-].
-			. ')*+'         // Loop possessively.
-			. '(?:]]>)?';   // End of comment. If not found, match all input.
-
-		$regex =
-			  '/('              // Capture the entire match.
-			.     '<'           // Find start of element.
-			.     '(?(?=!--)'   // Is this a comment?
-			.         $comments // Find end of comment.
-			.     '|'
-			.         '(?(?=!\[CDATA\[)' // Is this a comment?
-			.             $cdata // Find end of comment.
-			.         '|'
-			.             '[^>]*>?' // Find end of element. If not found, match all input.
-			.         ')'
-			.     ')'
-			. ')/s';
-	}
-
-	return preg_split( $regex, $input, -1, PREG_SPLIT_DELIM_CAPTURE );
-}
-
-/**
- * Replace characters or phrases within HTML elements only.
- *
- * @since 4.2.3
- *
- * @param string $haystack The text which has to be formatted.
- * @param array $replace_pairs In the form array('from' => 'to', ...).
- * @return string The formatted text.
- */
-function wp_replace_in_html_tags( $haystack, $replace_pairs ) {
-	// Find all elements.
-	$textarr = wp_html_split( $haystack );
-	$changed = false;
-
-	// Optimize when searching for one item.
-	if ( 1 === count( $replace_pairs ) ) {
-		// Extract $needle and $replace.
-		foreach ( $replace_pairs as $needle => $replace );
-
-		// Loop through delimeters (elements) only.
-		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) { 
-			if ( false !== strpos( $textarr[$i], $needle ) ) {
-				$textarr[$i] = str_replace( $needle, $replace, $textarr[$i] );
-				$changed = true;
-			}
-		}
-	} else {
-		// Extract all $needles.
-		$needles = array_keys( $replace_pairs );
-
-		// Loop through delimeters (elements) only.
-		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) { 
-			foreach ( $needles as $needle ) {
-				if ( false !== strpos( $textarr[$i], $needle ) ) {
-					$textarr[$i] = strtr( $textarr[$i], $replace_pairs );
-					$changed = true;
-					// After one strtr() break out of the foreach loop and look at next element.
-					break;
-				}
-			}
-		}
-	}
-
-	if ( $changed ) {
-		$haystack = implode( $textarr );
-	}
-
-	return $haystack;
-}
-
 /**
 * Newline preservation help function for wpautop
 *
--- a/wp-includes/js/tinymce/plugins/wordpress/plugin.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.js
@@ -91,10 +91,6 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 					'<img src="' + tinymce.Env.transparentSrc + '" class="wp-more-tag mce-wp-nextpage" ' +
 						'title="Page break" data-mce-resize="false" data-mce-placeholder="1" />' );
 			}
-
-			if ( e.content.indexOf( '<?"' ) !== -1 ) {
-				e.content = e.content.replace( /<\?"/g, '' );
-			}
 		}
 	});

--- a/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js
--- a/wp-includes/js/tinymce/wp-tinymce.js.gz
+++ b/wp-includes/js/tinymce/wp-tinymce.js.gz
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -489,82 +489,6 @@ function wp_kses( $string, $allowed_html, $allowed_protocols = array() ) {
 	return wp_kses_split($string, $allowed_html, $allowed_protocols);
 }

-/**
- * Filters one attribute only and ensures its value is allowed.
- *
- * This function has the advantage of being more secure than esc_attr() and can
- * escape data in some situations where wp_kses() must strip the whole attribute.
- *
- * @since 4.2.3
- *
- * @param string $string The 'whole' attribute, including name and value.
- * @param string $element The element name to which the attribute belongs.
- * @return string Filtered attribute.
- */
-function wp_kses_one_attr( $string, $element ) {
-	$uris = array('xmlns', 'profile', 'href', 'src', 'cite', 'classid', 'codebase', 'data', 'usemap', 'longdesc', 'action');
-	$allowed_html = wp_kses_allowed_html( 'post' );
-	$allowed_protocols = wp_allowed_protocols();
-	$string = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) );
-	$string = wp_kses_js_entities( $string );
-	$string = wp_kses_normalize_entities( $string );
-
-	// Preserve leading and trailing whitespace.
-	$matches = array();
-	preg_match('/^\s*/', $string, $matches);
-	$lead = $matches[0];
-	preg_match('/\s*$/', $string, $matches);
-	$trail = $matches[0];
-	if ( empty( $trail ) ) {
-		$string = substr( $string, strlen( $lead ) );
-	} else {
-		$string = substr( $string, strlen( $lead ), -strlen( $trail ) );
-	}
-	
-	// Parse attribute name and value from input.
-	$split = preg_split( '/\s*=\s*/', $string, 2 );
-	$name = $split[0];
-	if ( count( $split ) == 2 ) {
-		$value = $split[1];
-
-		// Remove quotes surrounding $value.
-		// Also guarantee correct quoting in $string for this one attribute.
-		if ( '' == $value ) {
-			$quote = '';
-		} else {
-			$quote = $value[0];
-		}
-		if ( '"' == $quote || "'" == $quote ) {
-			if ( substr( $value, -1 ) != $quote ) {
-				return '';
-			}
-			$value = substr( $value, 1, -1 );
-		} else {
-			$quote = '"';
-		}
-
-		// Sanitize quotes and angle braces.
-		$value = htmlspecialchars( $value, ENT_QUOTES, null, false );
-
-		// Sanitize URI values.
-		if ( in_array( strtolower( $name ), $uris ) ) {
-			$value = wp_kses_bad_protocol( $value, $allowed_protocols );
-		}
-
-		$string = "$name=$quote$value$quote";
-		$vless = 'n';
-	} else {
-		$value = '';
-		$vless = 'y';
-	}
-	
-	// Sanitize attribute by name.
-	wp_kses_attr_check( $name, $value, $string, $vless, $element, $allowed_html );
-
-	// Restore whitespace.
-	return $lead . $string . $trail;
-}
-
 /**
 * Return a list of allowed tags and attributes for a given context.
 *
@@ -786,11 +710,45 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
 	# Go through $attrarr, and save the allowed attributes for this element
 	# in $attr2
 	$attr2 = '';
-	foreach ( $attrarr as $arreach ) {
-		if ( wp_kses_attr_check( $arreach['name'], $arreach['value'], $arreach['whole'], $arreach['vless'], $element, $allowed_html ) ) {
-			$attr2 .= ' '.$arreach['whole'];
+
+	$allowed_attr = $allowed_html[strtolower($element)];
+	foreach ($attrarr as $arreach) {
+		if ( ! isset( $allowed_attr[strtolower($arreach['name'])] ) )
+			continue; # the attribute is not allowed
+
+		$current = $allowed_attr[strtolower($arreach['name'])];
+		if ( $current == '' )
+			continue; # the attribute is not allowed
+
+		if ( strtolower( $arreach['name'] ) == 'style' ) {
+			$orig_value = $arreach['value'];
+			$value = safecss_filter_attr( $orig_value );
+
+			if ( empty( $value ) )
+				continue;
+
+			$arreach['value'] = $value;
+			$arreach['whole'] = str_replace( $orig_value, $value, $arreach['whole'] );
 		}
-	}
+
+		if ( ! is_array($current) ) {
+			$attr2 .= ' '.$arreach['whole'];
+		# there are no checks
+
+		} else {
+			# there are some checks
+			$ok = true;
+			foreach ($current as $currkey => $currval) {
+				if ( ! wp_kses_check_attr_val($arreach['value'], $arreach['vless'], $currkey, $currval) ) {
+					$ok = false;
+					break;
+				}
+			}
+
+			if ( $ok )
+				$attr2 .= ' '.$arreach['whole']; # it passed them
+		} # if !is_array($current)
+	} # foreach

 	# Remove any "<" or ">" characters
 	$attr2 = preg_replace('/[<>]/', '', $attr2);
@@ -798,53 +756,6 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
 	return "<$element$attr2$xhtml_slash>";
 }

-/**
- * Determine whether an attribute is allowed.
- *
- * @since 4.2.3
- *
- * @param string $name The attribute name. Returns empty string when not allowed.
- * @param string $value The attribute value. Returns a filtered value.
- * @param string $whole The name=value input. Returns filtered input.
- * @param string $vless 'y' when attribute like "enabled", otherwise 'n'.
- * @param string $element The name of the element to which this attribute belongs.
- * @param array $allowed_html The full list of allowed elements and attributes.
- * @return bool Is the attribute allowed?
- */
-function wp_kses_attr_check( &$name, &$value, &$whole, $vless, $element, $allowed_html ) {
-	$allowed_attr = $allowed_html[strtolower( $element )];
-
-	$name_low = strtolower( $name );
-	if ( ! isset( $allowed_attr[$name_low] ) || '' == $allowed_attr[$name_low] ) {
-		$name = $value = $whole = '';
-		return false;
-	}
-
-	if ( 'style' == $name_low ) {
-		$new_value = safecss_filter_attr( $value );
-
-		if ( empty( $new_value ) ) {
-			$name = $value = $whole = '';
-			return false;
-		}
-
-		$whole = str_replace( $value, $new_value, $whole );
-		$value = $new_value;
-	}
-
-	if ( is_array( $allowed_attr[$name_low] ) ) {
-		// there are some checks
-		foreach ( $allowed_attr[$name_low] as $currkey => $currval ) {
-			if ( ! wp_kses_check_attr_val( $value, $vless, $currkey, $currval ) ) {
-				$name = $value = $whole = '';
-				return false;
-			}
-		}
-	}
-
-	return true;
-}
-
 /**
 * Builds an attribute list from string containing attributes.
 *
@@ -974,109 +885,6 @@ function wp_kses_hair($attr, $allowed_protocols) {
 	return $attrarr;
 }

-/**
- * Finds all attributes of an HTML element.
- *
- * Does not modify input.  May return "evil" output.
- *
- * Based on wp_kses_split2() and wp_kses_attr()
- *
- * @since 4.2.3
- *
- * @param string $element HTML element/tag
- * @return array|bool List of attributes found in $element. Returns false on failure.
- */
-function wp_kses_attr_parse( $element ) {
-	$valid = preg_match('%^(<\s*)(/\s*)?([a-zA-Z0-9]+\s*)([^>]*)(>?)$%', $element, $matches);
-	if ( 1 !== $valid ) {
-		return false;
-	}
-
-	$begin =  $matches[1];
-	$slash =  $matches[2];
-	$elname = $matches[3];
-	$attr =   $matches[4];
-	$end =    $matches[5];
-
-	if ( '' !== $slash ) {
-		// Closing elements do not get parsed.
-		return false;
-	}
-
-	// Is there a closing XHTML slash at the end of the attributes?
-	if ( 1 === preg_match( '%\s*/\s*$%', $attr, $matches ) ) {
-		$xhtml_slash = $matches[0];
-		$attr = substr( $attr, 0, -strlen( $xhtml_slash ) );
-	} else {
-		$xhtml_slash = '';
-	}
-	
-	// Split it
-	$attrarr = wp_kses_hair_parse( $attr );
-	if ( false === $attrarr ) {
-		return false;
-	}
-
-	// Make sure all input is returned by adding front and back matter.
-	array_unshift( $attrarr, $begin . $slash . $elname );
-	array_push( $attrarr, $xhtml_slash . $end );
-	
-	return $attrarr;
-}
-
-/**
- * Builds an attribute list from string containing attributes.
- *
- * Does not modify input.  May return "evil" output.
- * In case of unexpected input, returns false instead of stripping things.
- *
- * Based on wp_kses_hair() but does not return a multi-dimensional array.
- *
- * @since 4.2.3
- *
- * @param string $attr Attribute list from HTML element to closing HTML element tag
- * @return array|bool List of attributes found in $attr. Returns false on failure.
- */
-function wp_kses_hair_parse( $attr ) {
-	if ( '' === $attr ) {
-		return array();
-	}
-
-	$regex =
-	  '(?:'
-	.     '[-a-zA-Z:]+'   // Attribute name.
-	. '|'
-	.     '\[\[?[^\[\]]+\]\]?' // Shortcode in the name position implies unfiltered_html.
-	. ')'
-	. '(?:'               // Attribute value.
-	.     '\s*=\s*'       // All values begin with '='
-	.     '(?:'
-	.         '"[^"]*"'   // Double-quoted
-	.     '|'
-	.         "'[^']*'"   // Single-quoted
-	.     '|'
-	.         '[^\s"\']+' // Non-quoted
-	.         '(?:\s|$)'  // Must have a space
-	.     ')'
-	. '|'
-	.     '(?:\s|$)'      // If attribute has no value, space is required.
-	. ')'
-	. '\s*';              // Trailing space is optional except as mentioned above.
-
-	// Although it is possible to reduce this procedure to a single regexp,
-	// we must run that regexp twice to get exactly the expected result.
-
-	$validation = "%^($regex)+$%";
-	$extraction = "%$regex%";
-
-	if ( 1 === preg_match( $validation, $attr ) ) {
-		preg_match_all( $extraction, $attr, $attrarr );
-		return $attrarr[0];
-	} else {
-		return false;
-	}
-}
-
 /**
 * Performs different checks for attribute values.
 *
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -2736,11 +2736,10 @@ function wp_untrash_post_comments($post = null) {

 	foreach ( $group_by_status as $status => $comments ) {
 		// Sanity check. This shouldn't happen.
-		if ( 'post-trashed' == $status ) {
+		if ( 'post-trashed' == $status )
 			$status = '0';
-		}
-		$comments_in = implode( ', ', array_map( 'intval', $comments ) );
-		$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->comments SET comment_approved = %s WHERE comment_ID IN ($comments_in)", $status ) );
+		$comments_in = implode( "', '", $comments );
+		$wpdb->query( "UPDATE $wpdb->comments SET comment_approved = '$status' WHERE comment_ID IN ('" . $comments_in . "')" );
 	}

 	clean_comment_cache( array_keys($statuses) );
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -185,10 +185,9 @@ function has_shortcode( $content, $tag ) {
 * @uses get_shortcode_regex() Gets the search pattern for searching shortcodes.
 *
 * @param string $content Content to search for shortcodes
- * @param bool $ignore_html When true, shortcodes inside HTML elements will be skipped.
 * @return string Content with shortcodes filtered out.
 */
-function do_shortcode( $content, $ignore_html = false ) {
+function do_shortcode($content) {
 	global $shortcode_tags;

 	if ( false === strpos( $content, '[' ) ) {
@@ -198,24 +197,8 @@ function do_shortcode( $content, $ignore_html = false ) {
 	if (empty($shortcode_tags) || !is_array($shortcode_tags))
 		return $content;

-	$tagnames = array_keys($shortcode_tags);
-	$tagregexp = join( '|', array_map('preg_quote', $tagnames) );
-	$pattern = "/\\[($tagregexp)/s";
-
-	if ( 1 !== preg_match( $pattern, $content ) ) {
-		// Avoids parsing HTML when there are no shortcodes or embeds anyway.
-		return $content;
-	}
-
-	$content = do_shortcodes_in_html_tags( $content, $ignore_html );
-
 	$pattern = get_shortcode_regex();
-	$content = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $content );
-	
-	// Always restore square braces so we don't break things like <!--[if IE ]>
-	$content = unescape_invalid_shortcodes( $content );
-	
-	return $content;
+	return preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $content );
 }

 /**
@@ -308,127 +291,6 @@ function do_shortcode_tag( $m ) {
 	}
 }

-/**
- * Search only inside HTML elements for shortcodes and process them.
- *
- * Any [ or ] characters remaining inside elements will be HTML encoded
- * to prevent interference with shortcodes that are outside the elements.
- * Assumes $content processed by KSES already.  Users with unfiltered_html
- * capability may get unexpected output if angle braces are nested in tags.
- *
- * @since 4.2.3
- *
- * @param string $content Content to search for shortcodes
- * @param bool $ignore_html When true, all square braces inside elements will be encoded.
- * @return string Content with shortcodes filtered out.
- */
-function do_shortcodes_in_html_tags( $content, $ignore_html ) {
-	// Normalize entities in unfiltered HTML before adding placeholders.
-	$trans = array( '&#91;' => '&#091;', '&#93;' => '&#093;' );
-	$content = strtr( $content, $trans );
-	$trans = array( '[' => '&#91;', ']' => '&#93;' );
-	
-	$pattern = get_shortcode_regex();
-	$textarr = wp_html_split( $content );
-
-	foreach ( $textarr as &$element ) {
-		if ( '' == $element || '<' !== $element[0] ) {
-			continue;
-		}
-
-		$noopen = false === strpos( $element, '[' );
-		$noclose = false === strpos( $element, ']' );
-		if ( $noopen || $noclose ) {
-			// This element does not contain shortcodes.
-			if ( $noopen xor $noclose ) {
-				// Need to encode stray [ or ] chars.
-				$element = strtr( $element, $trans );
-			}
-			continue;
-		}
-
-		if ( $ignore_html || '<!--' === substr( $element, 0, 4 ) || '<![CDATA[' === substr( $element, 0, 9 ) ) {
-			// Encode all [ and ] chars.
-			$element = strtr( $element, $trans );
-			continue;
-		}
-
-		$attributes = wp_kses_attr_parse( $element );
-		if ( false === $attributes ) {
-			// Some plugins are doing things like [name] <[email]>.
-			if ( 1 === preg_match( '%^<\s*\[\[?[^\[\]]+\]%', $element ) ) {
-				$element = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $element );
-			}
-
-			// Looks like we found some crazy unfiltered HTML.  Skipping it for sanity.
-			$element = strtr( $element, $trans );
-			continue;
-		}
-		
-		// Get element name
-		$front = array_shift( $attributes );
-		$back = array_pop( $attributes );
-		$matches = array();
-		preg_match('%[a-zA-Z0-9]+%', $front, $matches);
-		$elname = $matches[0];
-		
-		// Look for shortcodes in each attribute separately.
-		foreach ( $attributes as &$attr ) {
-			$open = strpos( $attr, '[' );
-			$close = strpos( $attr, ']' );
-			if ( false === $open || false === $close ) {
-				continue; // Go to next attribute.  Square braces will be escaped at end of loop.
-			}
-			$double = strpos( $attr, '"' );
-			$single = strpos( $attr, "'" );
-			if ( ( false === $single || $open < $single ) && ( false === $double || $open < $double ) ) {
-				// $attr like '[shortcode]' or 'name = [shortcode]' implies unfiltered_html.
-				// In this specific situation we assume KSES did not run because the input
-				// was written by an administrator, so we should avoid changing the output
-				// and we do not need to run KSES here.
-				$attr = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $attr );
-			} else {
-				// $attr like 'name = "[shortcode]"' or "name = '[shortcode]'"
-				// We do not know if $content was unfiltered. Assume KSES ran before shortcodes.
-				$count = 0;
-				$new_attr = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $attr, -1, $count );
-				if ( $count > 0 ) {
-					// Sanitize the shortcode output using KSES.
-					$new_attr = wp_kses_one_attr( $new_attr, $elname );
-					if ( '' !== $new_attr ) {
-						// The shortcode is safe to use now.
-						$attr = $new_attr;
-					}
-				}
-			}
-		}
-		$element = $front . implode( '', $attributes ) . $back;
-		
-		// Now encode any remaining [ or ] chars.
-		$element = strtr( $element, $trans );
-	}
-	
-	$content = implode( '', $textarr );
-	
-	return $content;
-}
-
-/**
- * Remove placeholders added by do_shortcodes_in_html_tags().
- *
- * @since 4.2.3
- *
- * @param string $content Content to search for placeholders.
- * @return string Content with placeholders removed.
- */
-function unescape_invalid_shortcodes( $content ) {
-        // Clean up entire string, avoids re-parsing HTML.
-        $trans = array( '&#91;' => '[', '&#93;' => ']' );
-        $content = strtr( $content, $trans );
-        
-        return $content;
-}
-
 /**
 * Retrieve all attributes from the shortcodes tag.
 *
@@ -528,15 +390,9 @@ function strip_shortcodes( $content ) {
 	if (empty($shortcode_tags) || !is_array($shortcode_tags))
 		return $content;

-	$content = do_shortcodes_in_html_tags( $content, true );
-
 	$pattern = get_shortcode_regex();
-	$content = preg_replace_callback( "/$pattern/s", 'strip_shortcode_tag', $content );

-	// Always restore square braces so we don't break things like <!--[if IE ]>
-	$content = unescape_invalid_shortcodes( $content );
-	
-	return $content;
+	return preg_replace_callback( "/$pattern/s", 'strip_shortcode_tag', $content );
 }

 function strip_shortcode_tag( $m ) {
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -665,6 +665,8 @@ function preview_theme() {

 	// Prevent theme mods to current theme being used on theme being previewed
 	add_filter( 'pre_option_theme_mods_' . get_option( 'stylesheet' ), '__return_empty_array' );
+
+	ob_start( 'preview_theme_ob_filter' );
 }
 add_action('setup_theme', 'preview_theme');

@@ -702,7 +704,7 @@ function _preview_theme_stylesheet_filter() {
 * @return string
 */
 function preview_theme_ob_filter( $content ) {
-	return $content;
+	return preg_replace_callback( "|(<a.*?href=([\"']))(.*?)([\"'].*?>)|", 'preview_theme_ob_filter_callback', $content );
 }

 /**
@@ -717,7 +719,26 @@ function preview_theme_ob_filter( $content ) {
 * @return string
 */
 function preview_theme_ob_filter_callback( $matches ) {
-	return $matches[0];
+	if ( strpos($matches[4], 'onclick') !== false )
+		$matches[4] = preg_replace('#onclick=([\'"]).*?(?<!\\\)\\1#i', '', $matches[4]); //Strip out any onclicks from rest of <a>. (?<!\\\) means to ignore the '" if it's escaped by \  to prevent breaking mid-attribute.
+	if (
+		( false !== strpos($matches[3], '/wp-admin/') )
+	||
+		( false !== strpos( $matches[3], '://' ) && 0 !== strpos( $matches[3], home_url() ) )
+	||
+		( false !== strpos($matches[3], '/feed/') )
+	||
+		( false !== strpos($matches[3], '/trackback/') )
+	)
+		return $matches[1] . "#$matches[2] onclick=$matches[2]return false;" . $matches[4];
+
+	$stylesheet = isset( $_GET['stylesheet'] ) ? $_GET['stylesheet'] : '';
+	$template   = isset( $_GET['template'] )   ? $_GET['template']   : '';
+
+	$link = add_query_arg( array( 'preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'preview_iframe' => 1 ), $matches[3] );
+	if ( 0 === strpos($link, 'preview=1') )
+		$link = "?$link";
+	return $matches[1] . esc_attr( $link ) . $matches[4];
 }

 /**
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,21 +4,21 @@
 *
 * @global string $wp_version
 */
-$wp_version = '3.9.8';
+$wp_version = '3.9.4';

 /**
 * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
 *
 * @global int $wp_db_version
 */
-$wp_db_version = 27918;
+$wp_db_version = 27916;

 /**
 * Holds the TinyMCE version
 *
 * @global string $tinymce_version
 */
-$tinymce_version = '4021-20150505';
+$tinymce_version = '4021-20140423';

 /**
 * Holds the required PHP version
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -1751,8 +1751,6 @@ class wpdb {
 	 * @return int|false The number of rows affected, or false on error.
 	 */
 	function _insert_replace_helper( $table, $data, $format = null, $type = 'INSERT' ) {
-		$this->insert_id = 0;
-
 		if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ) ) ) {
 			return false;
 		}
@@ -1773,6 +1771,7 @@ class wpdb {

 		$sql = "$type INTO `$table` ($fields) VALUES ($formats)";

+		$this->insert_id = 0;
 		$this->check_current_query = false;
 		return $this->query( $this->prepare( $sql, $values ) );
 	}
@@ -1894,20 +1893,11 @@ class wpdb {
 	 */
 	protected function process_fields( $table, $data, $format ) {
 		$data = $this->process_field_formats( $data, $format );
-		if ( false === $data ) {
-			return false;
-		}
-
 		$data = $this->process_field_charsets( $data, $table );
 		if ( false === $data ) {
 			return false;
 		}

-		$data = $this->process_field_lengths( $data, $table );
-		if ( false === $data ) {
-			return false;
-		}
-
 		$converted_data = $this->strip_invalid_text( $data );

 		if ( $data !== $converted_data ) {
@@ -1969,41 +1959,17 @@ class wpdb {
 				// We can skip this field if we know it isn't a string.
 				// This checks %d/%f versus ! %s because it's sprintf() could take more.
 				$value['charset'] = false;
+			} elseif ( $this->check_ascii( $value['value'] ) ) {
+				// If it's ASCII, then we don't need the charset. We can skip this field.
+				$value['charset'] = false;
 			} else {
 				$value['charset'] = $this->get_col_charset( $table, $field );
 				if ( is_wp_error( $value['charset'] ) ) {
 					return false;
 				}
-			}

-			$data[ $field ] = $value;
-		}
-
-		return $data;
-	}
-
-	/**
-	 * For string fields, record the maximum string length that field can safely save.
-	 *
-	 * @since 4.2.1
-	 * @access protected
-	 *
-	 * @param array  $data  As it comes from the wpdb::process_field_charsets() method.
-	 * @param string $table Table name.
-	 * @return array|False The same array as $data with additional 'length' keys, or false if
-	 *                     any of the values were too long for their corresponding field.
-	 */
-	protected function process_field_lengths( $data, $table ) {
-		foreach ( $data as $field => $value ) {
-			if ( '%d' === $value['format'] || '%f' === $value['format'] ) {
-				// We can skip this field if we know it isn't a string.
-				// This checks %d/%f versus ! %s because it's sprintf() could take more.
-				$value['length'] = false;
-			} else {
-				$value['length'] = $this->get_col_length( $table, $field );
-				if ( is_wp_error( $value['length'] ) ) {
-					return false;
-				}
+				// This isn't ASCII. Don't have strip_invalid_text() re-check.
+				$value['ascii'] = false;
 			}

 			$data[ $field ] = $value;
@@ -2209,10 +2175,7 @@ class wpdb {
 		}

 		$charsets = $columns = array();
-
-		$table_parts = explode( '.', $table );
-		$table = '`' . implode( '`.`', $table_parts ) . '`';
-		$results = $this->get_results( "SHOW FULL COLUMNS FROM $table" );
+		$results = $this->get_results( "SHOW FULL COLUMNS FROM `$table`" );
 		if ( ! $results ) {
 			return new WP_Error( 'wpdb_get_table_charset_failure' );
 		}
@@ -2335,99 +2298,6 @@ class wpdb {
 		return $charset;
 	}

-	/**
-	 * Retrieve the maximum string length allowed in a given column.
-	 * The length may either be specified as a byte length or a character length.
-	 *
-	 * @since 4.2.1
-	 * @access public
-	 *
-	 * @param string $table  Table name.
-	 * @param string $column Column name.
-	 * @return mixed array( 'length' => (int), 'type' => 'byte' | 'char' )
-	 *               false if the column has no length (for example, numeric column)
-	 *               WP_Error object if there was an error.
-	 */
-	public function get_col_length( $table, $column ) {
-		$tablekey = strtolower( $table );
-		$columnkey = strtolower( $column );
-
-		// Skip this entirely if this isn't a MySQL database.
-		if ( false === $this->is_mysql ) {
-			return false;
-		}
-
-		if ( empty( $this->col_meta[ $tablekey ] ) ) {
-			// This primes column information for us.
-			$table_charset = $this->get_table_charset( $table );
-			if ( is_wp_error( $table_charset ) ) {
-				return $table_charset;
-			}
-		}
-
-		if ( empty( $this->col_meta[ $tablekey ][ $columnkey ] ) ) {
-			return false;
-		}
-
-		$typeinfo = explode( '(', $this->col_meta[ $tablekey ][ $columnkey ]->Type );
-
-		$type = strtolower( $typeinfo[0] );
-		if ( ! empty( $typeinfo[1] ) ) {
-			$length = trim( $typeinfo[1], ')' );
-		} else {
-			$length = false;
-		}
-
-		switch( $type ) {
-			case 'char':
-			case 'varchar':
-				return array(
-					'type'   => 'char',
-					'length' => (int) $length,
-				);
-				break;
-			case 'binary':
-			case 'varbinary':
-				return array(
-					'type'   => 'byte',
-					'length' => (int) $length,
-				);
-				break;
-			case 'tinyblob':
-			case 'tinytext':
-				return array(
-					'type'   => 'byte',
-					'length' => 255,        // 2^8 - 1
-				);
-				break;
-			case 'blob':
-			case 'text':
-				return array(
-					'type'   => 'byte',
-					'length' => 65535,      // 2^16 - 1
-				);
-				break;
-			case 'mediumblob':
-			case 'mediumtext':
-				return array(
-					'type'   => 'byte',
-					'length' => 16777215,   // 2^24 - 1
-				);
-				break;
-			case 'longblob':
-			case 'longtext':
-				return array(
-					'type'   => 'byte',
-					'length' => 4294967295, // 2^32 - 1
-				);
-				break;
-			default:
-				return false;
-		}
-
-		return false;
-	}
-
 	/**
 	 * Check if a string is ASCII.
 	 *
@@ -2468,7 +2338,7 @@ class wpdb {

 		// We don't need to check the collation for queries that don't read data.
 		$query = ltrim( $query, "\r\n\t (" );
-		if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $query ) ) {
+		if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN)\s/i', $query ) ) {
 			return true;
 		}

@@ -2526,55 +2396,50 @@ class wpdb {
 	 */
 		// If any of the columns don't have one of these collations, it needs more sanity checking.
 	protected function strip_invalid_text( $data ) {
+		// Some multibyte character sets that we can check in PHP.
+		$mb_charsets = array(
+			'ascii'   => 'ASCII',
+			'big5'    => 'BIG-5',
+			'eucjpms' => 'eucJP-win',
+			'gb2312'  => 'EUC-CN',
+			'ujis'    => 'EUC-JP',
+			'utf32'   => 'UTF-32',
+		);
+
+		$supported_charsets = array();
+		if ( function_exists( 'mb_list_encodings' ) ) {
+			$supported_charsets = mb_list_encodings();
+		}
+
 		$db_check_string = false;

 		foreach ( $data as &$value ) {
 			$charset = $value['charset'];

-			if ( is_array( $value['length'] ) ) {
-				$length = $value['length']['length'];
-			} else {
-				$length = false;
-			}
-
-			// There's no charset to work with.
-			if ( false === $charset ) {
+			// Column isn't a string, or is latin1, which will will happily store anything.
+			if ( false === $charset || 'latin1' === $charset ) {
 				continue;
 			}

-			// Column isn't a string.
 			if ( ! is_string( $value['value'] ) ) {
 				continue;
 			}

-			$truncate_by_byte_length = 'byte' === $value['length']['type'];
-
-			$needs_validation = true;
-			if (
-				// latin1 can store any byte sequence
-				'latin1' === $charset
-			||
-				// ASCII is always OK.
-				( ! isset( $value['ascii'] ) && $this->check_ascii( $value['value'] ) )
-			) {
-				$truncate_by_byte_length = true;
-				$needs_validation = false;
+			// ASCII is always OK.
+			if ( ! isset( $value['ascii'] ) && $this->check_ascii( $value['value'] ) ) {
+				continue;
 			}

-			if ( $truncate_by_byte_length ) {
-				mbstring_binary_safe_encoding();
-				if ( false !== $length && strlen( $value['value'] ) > $length ) {
-					$value['value'] = substr( $value['value'], 0, $length );
-				}
-				reset_mbstring_encoding();
-
-				if ( ! $needs_validation ) {
+			// Convert the text locally.
+			if ( $supported_charsets ) {
+				if ( isset( $mb_charsets[ $charset ] ) && in_array( $mb_charsets[ $charset ], $supported_charsets ) ) {
+					$value['value'] = mb_convert_encoding( $value['value'], $mb_charsets[ $charset ], $mb_charsets[ $charset ] );
 					continue;
 				}
 			}

 			// utf8 can be handled by regex, which is a bunch faster than a DB lookup.
-			if ( ( 'utf8' === $charset || 'utf8mb3' === $charset || 'utf8mb4' === $charset ) && function_exists( 'mb_strlen' ) ) {
+			if ( 'utf8' === $charset || 'utf8mb3' === $charset || 'utf8mb4' === $charset ) {
 				$regex = '/
 					(
 						(?: [\x00-\x7F]                  # single-byte sequences   0xxxxxxx
@@ -2584,7 +2449,7 @@ class wpdb {
 						|   \xED[\x80-\x9F][\x80-\xBF]
 						|   [\xEE-\xEF][\x80-\xBF]{2}';

-				if ( 'utf8mb4' === $charset ) {
+				if ( 'utf8mb4' === $charset) {
 					$regex .= '
 						|    \xF0[\x90-\xBF][\x80-\xBF]{2} # four-byte sequences   11110xxx 10xxxxxx * 3
 						|    [\xF1-\xF3][\x80-\xBF]{3}
@@ -2592,16 +2457,11 @@ class wpdb {
 					';
 				}

-				$regex .= '){1,40}                          # ...one or more times
+				$regex .= '){1,50}                          # ...one or more times
 					)
 					| .                                  # anything else
 					/x';
 				$value['value'] = preg_replace( $regex, '$1', $value['value'] );
-
-
-				if ( false !== $length && mb_strlen( $value['value'], 'UTF-8' ) > $length ) {
-					$value['value'] = mb_substr( $value['value'], 0, $length, 'UTF-8' );
-				}
 				continue;
 			}

@@ -2618,15 +2478,8 @@ class wpdb {
 						$queries[ $value['charset'] ] = array();
 					}

-					// We're going to need to truncate by characters or bytes, depending on the length value we have.
-					if ( 'byte' === $value['length']['type'] ) {
-						// Split the CONVERT() calls by charset, so we can make sure the connection is right
-						$queries[ $value['charset'] ][ $col ] = $this->prepare( "CONVERT( LEFT( CONVERT( %s USING binary ), %d ) USING {$value['charset']} )", $value['value'], $value['length']['length'] );
-					} else {
-						$queries[ $value['charset'] ][ $col ] = $this->prepare( "LEFT( CONVERT( %s USING {$value['charset']} ), %d )", $value['value'], $value['length']['length'] );
-					}
-
-					unset( $data[ $col ]['db'] );
+					// Split the CONVERT() calls by charset, so we can make sure the connection is right
+					$queries[ $value['charset'] ][ $col ] = $this->prepare( "CONVERT( %s USING {$value['charset']} )", $value['value'] );
 				}
 			}

@@ -2644,19 +2497,16 @@ class wpdb {

 				$this->check_current_query = false;

-				$sql = array();
-				foreach ( $query as $column => $column_query ) {
-					$sql[] = $column_query . " AS x_$column";
-				}
-
-				$row = $this->get_row( "SELECT " . implode( ', ', $sql ), ARRAY_A );
+				$row = $this->get_row( "SELECT " . implode( ', ', $query ), ARRAY_N );
 				if ( ! $row ) {
 					$this->set_charset( $this->dbh, $connection_charset );
 					return new WP_Error( 'wpdb_strip_invalid_text_failure' );
 				}

-				foreach ( array_keys( $query ) as $column ) {
-					$data[ $column ]['value'] = $row["x_$column"];
+				$cols = array_keys( $query );
+				$col_count = count( $cols );
+				for ( $ii = 0; $ii < $col_count; $ii++ ) {
+					$data[ $cols[ $ii ] ]['value'] = $row[ $ii ];
 				}
 			}

@@ -2679,12 +2529,6 @@ class wpdb {
 	 * @return string|WP_Error The converted query, or a {@see WP_Error} object if the conversion fails.
 	 */
 	protected function strip_invalid_text_from_query( $query ) {
-		// We don't need to check the collation for queries that don't read data.
-		$trimmed_query = ltrim( $query, "\r\n\t (" );
-		if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $trimmed_query ) ) {
-			return $query;
-		}
-
 		$table = $this->get_table_from_query( $query );
 		if ( $table ) {
 			$charset = $this->get_table_charset( $table );
@@ -2704,7 +2548,6 @@ class wpdb {
 			'value'   => $query,
 			'charset' => $charset,
 			'ascii'   => false,
-			'length'  => false,
 		);

 		$data = $this->strip_invalid_text( array( $data ) );
@@ -2727,7 +2570,7 @@ class wpdb {
 	 * @return string|WP_Error The converted string, or a `WP_Error` object if the conversion fails.
 	 */
 	public function strip_invalid_text_for_column( $table, $column, $value ) {
-		if ( ! is_string( $value ) ) {
+		if ( ! is_string( $value ) || $this->check_ascii( $value ) ) {
 			return $value;
 		}

@@ -2744,7 +2587,7 @@ class wpdb {
 			$column => array(
 				'value'   => $value,
 				'charset' => $charset,
-				'length'  => $this->get_col_length( $table, $column ),
+				'ascii'   => false,
 			)
 		);

@@ -2785,16 +2628,16 @@ class wpdb {
 				. '|REPLACE(?:\s+LOW_PRIORITY|\s+DELAYED)?(?:\s+INTO)?'
 				. '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?'
 				. '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:\s+FROM)?'
-				. ')\s+((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) {
-			return str_replace( '`', '', $maybe[1] );
+				. ')\s+`?([\w-]+)`?/is', $query, $maybe ) ) {
+			return $maybe[1];
 		}

 		// SHOW TABLE STATUS and SHOW TABLES
 		if ( preg_match( '/^\s*(?:'
 				. 'SHOW\s+TABLE\s+STATUS.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
 				. '|SHOW\s+(?:FULL\s+)?TABLES.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
-				. ')\W((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe ) ) {
-			return str_replace( '`', '', $maybe[1] );
+				. ')\W([\w-]+)\W/is', $query, $maybe ) ) {
+			return $maybe[1];
 		}

 		// Big pattern for the rest of the table-related queries.
@@ -2812,8 +2655,8 @@ class wpdb {
 				. '|LOAD\s+DATA.*INFILE.*INTO\s+TABLE'
 				. '|(?:GRANT|REVOKE).*ON\s+TABLE'
 				. '|SHOW\s+(?:.*FROM|.*TABLE)'
-				. ')\s+\(*\s*((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe ) ) {
-			return str_replace( '`', '', $maybe[1] );
+				. ')\s+\(*\s*`?([\w-]+)`?\s*\)*/is', $query, $maybe ) ) {
+			return $maybe[1];
 		}

 		return false;