Merge branch 'trunk' into remove-ie-conditionals

Author: joedolson

docker-compose.yml

@@ -70,7 +70,7 @@ services:
       - wpdevnet
 
     ports:
-      - "3306"
+      - "${LOCAL_DB_PORTS-3306}"
 
     environment:
       MYSQL_ROOT_PASSWORD: password

src/js/_enqueues/lib/emoji-loader.js

@@ -2,6 +2,8 @@
  * @output wp-includes/js/wp-emoji-loader.js
  */
 
+/* eslint-env es6 */
+
 // Note: This is loaded as a script module, so there is no need for an IIFE to prevent pollution of the global scope.
 
 /**
@@ -12,15 +14,13 @@
  * @property {?string} source.concatemoji
  * @property {?string} source.twemoji
  * @property {?string} source.wpemoji
- * @property {?boolean} DOMReady
- * @property {?Function} readyCallback
  */
 
 const settings = /** @type {WPEmojiSettings} */ (
 	JSON.parse( document.getElementById( 'wp-emoji-settings' ).textContent )
 );
 
-// For compatibility with other scripts that read from this global.
+// For compatibility with other scripts that read from this global, in particular wp-includes/js/wp-emoji.js (source file: js/_enqueues/wp/emoji.js).
 window._wpemojiSettings = settings;
 
 /**
@@ -422,17 +422,8 @@ new Promise( ( resolve ) => {
 			settings.supports.everythingExceptFlag &&
 			! settings.supports.flag;
 
-		// Sets DOMReady to false and assigns a ready function to settings.
-		settings.DOMReady = false;
-		settings.readyCallback = () => {
-			settings.DOMReady = true;
-		};
-	} )
-	.then( () => {
 		// When the browser can not render everything we need to load a polyfill.
 		if ( ! settings.supports.everything ) {
-			settings.readyCallback();
-
 			const src = settings.source || {};
 
 			if ( src.concatemoji ) {

src/js/_enqueues/wp/emoji.js

@@ -277,16 +277,7 @@
 			return twemoji.parse( object, params );
 		}
 
-		/**
-		 * Initialize our emoji support, and set up listeners.
-		 */
-		if ( settings ) {
-			if ( settings.DOMReady ) {
-				load();
-			} else {
-				settings.readyCallback = load;
-			}
-		}
+		load();
 
 		return {
 			parse: parse,

src/js/_enqueues/wp/sanitize.js

@@ -2,6 +2,8 @@
  * @output wp-includes/js/wp-sanitize.js
  */
 
+/* eslint-env es6 */
+
 ( function () {
 
 	window.wp = window.wp || {};
@@ -16,24 +18,24 @@
 		/**
 		 * Strip HTML tags.
 		 *
-		 * @param {string} text Text to strip the HTML tags from.
+		 * @param {string} text - Text to strip the HTML tags from.
 		 *
-		 * @return  Stripped text.
+		 * @return {string} Stripped text.
 		 */
 		stripTags: function( text ) {
-			text = text || '';
+			let _text = text || '';
+
+			// Do the search-replace until there is nothing to be replaced.
+			do {
+				// Keep pre-replace text for comparison.
+				text = _text;
 
-			// Do the replacement.
-			var _text = text
+				// Do the replacement.
+				_text = text
 					.replace( /<!--[\s\S]*?(-->|$)/g, '' )
 					.replace( /<(script|style)[^>]*>[\s\S]*?(<\/\1>|$)/ig, '' )
 					.replace( /<\/?[a-z][\s\S]*?(>|$)/ig, '' );
-
-			// If the initial text is not equal to the modified text,
-			// do the search-replace again, until there is nothing to be replaced.
-			if ( _text !== text ) {
-				return wp.sanitize.stripTags( _text );
-			}
+			} while ( _text !== text );
 
 			// Return the text with stripped tags.
 			return _text;
@@ -42,12 +44,12 @@
 		/**
 		 * Strip HTML tags and convert HTML entities.
 		 *
-		 * @param {string} text Text to strip tags and convert HTML entities.
+		 * @param {string} text - Text to strip tags and convert HTML entities.
 		 *
-		 * @return Sanitized text. False on failure.
+		 * @return {string} Sanitized text.
 		 */
 		stripTagsAndEncodeText: function( text ) {
-			var _text = wp.sanitize.stripTags( text ),
+			let _text = wp.sanitize.stripTags( text ),
 				textarea = document.createElement( 'textarea' );
 
 			try {

src/wp-activate.php

@@ -64,10 +64,6 @@
 
 nocache_headers();
 
-if ( is_object( $wp_object_cache ) ) {
-	$wp_object_cache->cache_enabled = false;
-}
-
 // Fix for page title.
 $wp_query->is_404 = false;
 

src/wp-admin/admin.php

@@ -72,26 +72,30 @@
 	 * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
 	 */
 	if ( apply_filters( 'do_mu_upgrade', true ) ) {
-		$c = get_blog_count();
+		$blog_count = get_blog_count();
 
 		/*
 		 * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load:
 		 * attempt to do no more than threshold value, with some +/- allowed.
 		 */
-		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) === 1 ) ) {
+		if ( $blog_count <= 50 || ( $blog_count > 50 && mt_rand( 0, (int) ( $blog_count / 50 ) ) === 1 ) ) {
 			require_once ABSPATH . WPINC . '/http.php';
+
 			$response = wp_remote_get(
 				admin_url( 'upgrade.php?step=1' ),
 				array(
 					'timeout'     => 120,
 					'httpversion' => '1.1',
 				)
 			);
+
 			/** This action is documented in wp-admin/network/upgrade.php */
 			do_action( 'after_mu_upgrade', $response );
+
 			unset( $response );
 		}
-		unset( $c );
+
+		unset( $blog_count );
 	}
 }
 

src/wp-admin/plugin-editor.php

@@ -93,9 +93,11 @@
 $posted_content = null;
 
 if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
-	$r = wp_edit_theme_plugin_file( wp_unslash( $_POST ) );
-	if ( is_wp_error( $r ) ) {
-		$edit_error = $r;
+	$edit_result = wp_edit_theme_plugin_file( wp_unslash( $_POST ) );
+
+	if ( is_wp_error( $edit_result ) ) {
+		$edit_error = $edit_result;
+
 		if ( check_ajax_referer( 'edit-plugin_' . $file, 'nonce', false ) && isset( $_POST['newcontent'] ) ) {
 			$posted_content = wp_unslash( $_POST['newcontent'] );
 		}
@@ -122,9 +124,10 @@
 } else {
 	// Get the extension of the file.
 	if ( preg_match( '/\.([^.]+)$/', $real_file, $matches ) ) {
-		$ext = strtolower( $matches[1] );
+		$extension = strtolower( $matches[1] );
+
 		// If extension is not in the acceptable list, skip it.
-		if ( ! in_array( $ext, $editable_extensions, true ) ) {
+		if ( ! in_array( $extension, $editable_extensions, true ) ) {
 			wp_die( sprintf( '<p>%s</p>', __( 'Files of this type are not editable.' ) ) );
 		}
 	}

src/wp-admin/revision.php

@@ -15,11 +15,10 @@
 require ABSPATH . 'wp-admin/includes/revision.php';
 
 /**
- * @global int    $revision Optional. The revision ID.
- * @global string $action   The action to take.
- *                          Accepts 'restore', 'view' or 'edit'.
- * @global int    $from     The revision to compare from.
- * @global int    $to       Optional, required if revision missing. The revision to compare to.
+ * @global int    $revision_id Optional. The revision ID.
+ * @global string $action      The action to take. Accepts 'restore', 'view', or 'edit'.
+ * @global int    $from        The revision to compare from.
+ * @global int    $to          Optional, required if revision missing. The revision to compare to.
  */
 
 $revision_id = ! empty( $_REQUEST['revision'] ) ? absint( $_REQUEST['revision'] ) : 0;

src/wp-admin/theme-editor.php

@@ -121,9 +121,11 @@
 $posted_content = null;
 
 if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
-	$r = wp_edit_theme_plugin_file( wp_unslash( $_POST ) );
-	if ( is_wp_error( $r ) ) {
-		$edit_error = $r;
+	$edit_result = wp_edit_theme_plugin_file( wp_unslash( $_POST ) );
+
+	if ( is_wp_error( $edit_result ) ) {
+		$edit_error = $edit_result;
+
 		if ( check_ajax_referer( 'edit-theme_' . $stylesheet . '_' . $relative_file, 'nonce', false ) && isset( $_POST['newcontent'] ) ) {
 			$posted_content = wp_unslash( $_POST['newcontent'] );
 		}

src/wp-content/themes/twentyfifteen/functions.php

@@ -412,7 +412,14 @@ function twentyfifteen_fonts_url() {
  * @since Twenty Fifteen 1.1
  */
 function twentyfifteen_javascript_detection() {
-	echo "<script>(function(html){html.className = html.className.replace(/\bno-js\b/,'js')})(document.documentElement);</script>\n";
+	$js  = "(function(html){html.className = html.className.replace(/\bno-js\b/,'js')})(document.documentElement);";
+	$js .= "\n//# sourceURL=" . rawurlencode( __FUNCTION__ );
+
+	if ( function_exists( 'wp_print_inline_script_tag' ) ) {
+		wp_print_inline_script_tag( $js );
+	} else {
+		echo "<script>$js</script>\n";
+	}
 }
 add_action( 'wp_head', 'twentyfifteen_javascript_detection', 0 );