Merge pull request azureappserviceoss#37 from OPIG/atomUpdate

Version update to 4.9.2. Test Status Pass.
aaltotsky · Jan 22, 2018 · 8b4dee9 · 8b4dee9
2 parents 2bcba3e + 4476d72
commit 8b4dee9
Show file tree

Hide file tree

Showing 48 changed files with 250 additions and 123 deletions.
diff --git a/license.txt b/license.txt
@@ -1,6 +1,6 @@
 WordPress - Web publishing software
 
-Copyright 2011-2017 by the contributors
+Copyright 2011-2018 by the contributors
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/wp-admin/about.php b/wp-admin/about.php
@@ -32,6 +32,24 @@
 
 		<div class="changelog point-releases">
 			<h3><?php _e( 'Maintenance and Security Releases' ); ?></h3>
+			<p>
+				<?php
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					_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.',
+						22
+					),
+					'4.9.2',
+					number_format_i18n( 22 )
+				);
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.2' );
+				?>
+			</p>
 			<p>
 				<?php
 				printf(

diff --git a/wp-admin/css/common-rtl.css b/wp-admin/css/common-rtl.css
@@ -1188,11 +1188,19 @@ th.action-links {
 
 .filter-drawer .filter-group-feature input,
 .filter-drawer .filter-group-feature label {
-	display: inline-block;
-	margin: 7px 0 7px 4px;
 	line-height: 16px;
 }
 
+.filter-drawer .filter-group-feature input {
+	position: absolute;
+	margin: 0;
+}
+
+.filter-group .filter-group-feature label {
+	display: block;
+	margin: 14px 23px 14px 0px;
+}
+
 .filter-drawer .buttons {
 	clear: both;
 	margin-bottom: 20px;
@@ -3889,6 +3897,10 @@ img {
 		line-height: 25px;
 	}
 
+	.filter-drawer .filter-group-feature label {
+		margin-right: 32px;
+	}
+
 	.wp-filter .button.drawer-toggle {
 		font-size: 13px;
 		line-height: 26px;

diff --git a/wp-admin/css/common-rtl.min.css b/wp-admin/css/common-rtl.min.css
diff --git a/wp-admin/css/common.css b/wp-admin/css/common.css
@@ -1188,11 +1188,19 @@ th.action-links {
 
 .filter-drawer .filter-group-feature input,
 .filter-drawer .filter-group-feature label {
-	display: inline-block;
-	margin: 7px 4px 7px 0;
 	line-height: 16px;
 }
 
+.filter-drawer .filter-group-feature input {
+	position: absolute;
+	margin: 0;
+}
+
+.filter-group .filter-group-feature label {
+	display: block;
+	margin: 14px 0px 14px 23px;
+}
+
 .filter-drawer .buttons {
 	clear: both;
 	margin-bottom: 20px;
@@ -3889,6 +3897,10 @@ img {
 		line-height: 25px;
 	}
 
+	.filter-drawer .filter-group-feature label {
+		margin-left: 32px;
+	}
+
 	.wp-filter .button.drawer-toggle {
 		font-size: 13px;
 		line-height: 26px;

diff --git a/wp-admin/css/common.min.css b/wp-admin/css/common.min.css
diff --git a/wp-admin/css/customize-nav-menus-rtl.css b/wp-admin/css/customize-nav-menus-rtl.css
@@ -216,6 +216,10 @@
 	padding-top: 12px;
 }
 
+.menu-location-settings .customize-control-checkbox .theme-location-set {
+	line-height: 1;
+}
+
 .customize-control-nav_menu_auto_add label {
 	vertical-align: top;
 }

diff --git a/wp-admin/css/customize-nav-menus-rtl.min.css b/wp-admin/css/customize-nav-menus-rtl.min.css
diff --git a/wp-admin/css/customize-nav-menus.css b/wp-admin/css/customize-nav-menus.css
@@ -216,6 +216,10 @@
 	padding-top: 12px;
 }
 
+.menu-location-settings .customize-control-checkbox .theme-location-set {
+	line-height: 1;
+}
+
 .customize-control-nav_menu_auto_add label {
 	vertical-align: top;
 }

diff --git a/wp-admin/css/customize-nav-menus.min.css b/wp-admin/css/customize-nav-menus.min.css
diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php
@@ -343,7 +343,7 @@ function wp_read_image_metadata( $file ) {
 	if ( ! file_exists( $file ) )
 		return false;
 
-	list( , , $sourceImageType ) = getimagesize( $file );
+	list( , , $sourceImageType ) = @getimagesize( $file );
 
 	/*
 	 * EXIF contains a bunch of data we'll probably never need formatted in ways
@@ -372,10 +372,10 @@ function wp_read_image_metadata( $file ) {
 	 * as caption, description etc.
 	 */
 	if ( is_callable( 'iptcparse' ) ) {
-		getimagesize( $file, $info );
+		@getimagesize( $file, $info );
 
 		if ( ! empty( $info['APP13'] ) ) {
-			$iptc = iptcparse( $info['APP13'] );
+			$iptc = @iptcparse( $info['APP13'] );
 
 			// Headline, "A brief synopsis of the caption."
 			if ( ! empty( $iptc['2#105'][0] ) ) {

diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
@@ -355,7 +355,7 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
 		}
 
 	// Use image exif/iptc data for title and caption defaults if possible.
-	} elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = @wp_read_image_metadata( $file ) ) {
+	} elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = wp_read_image_metadata( $file ) ) {
 		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
 			$title = $image_meta['title'];
 		}
@@ -419,7 +419,7 @@ function media_handle_sideload( $file_array, $post_id, $desc = null, $post_data
 	$content = '';
 
 	// Use image exif/iptc data for title and caption defaults if possible.
-	if ( $image_meta = @wp_read_image_metadata($file) ) {
+	if ( $image_meta = wp_read_image_metadata( $file ) ) {
 		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
 			$title = $image_meta['title'];
 		if ( trim( $image_meta['caption'] ) )

diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
@@ -743,6 +743,42 @@
 'wp-includes/js/plupload/plupload.silverlight.xap',
 'wp-includes/js/swfupload/plugins',
 'wp-includes/js/swfupload/swfupload.swf',
+	// 4.9.2
+	'wp-includes/js/mediaelement/lang',
+	'wp-includes/js/mediaelement/lang/ca.js',
+	'wp-includes/js/mediaelement/lang/cs.js',
+	'wp-includes/js/mediaelement/lang/de.js',
+	'wp-includes/js/mediaelement/lang/es.js',
+	'wp-includes/js/mediaelement/lang/fa.js',
+	'wp-includes/js/mediaelement/lang/fr.js',
+	'wp-includes/js/mediaelement/lang/hr.js',
+	'wp-includes/js/mediaelement/lang/hu.js',
+	'wp-includes/js/mediaelement/lang/it.js',
+	'wp-includes/js/mediaelement/lang/ja.js',
+	'wp-includes/js/mediaelement/lang/ko.js',
+	'wp-includes/js/mediaelement/lang/nl.js',
+	'wp-includes/js/mediaelement/lang/pl.js',
+	'wp-includes/js/mediaelement/lang/pt.js',
+	'wp-includes/js/mediaelement/lang/ro.js',
+	'wp-includes/js/mediaelement/lang/ru.js',
+	'wp-includes/js/mediaelement/lang/sk.js',
+	'wp-includes/js/mediaelement/lang/sv.js',
+	'wp-includes/js/mediaelement/lang/uk.js',
+	'wp-includes/js/mediaelement/lang/zh-cn.js',
+	'wp-includes/js/mediaelement/lang/zh.js',
+	'wp-includes/js/mediaelement/mediaelement-flash-audio-ogg.swf',
+	'wp-includes/js/mediaelement/mediaelement-flash-audio.swf',
+	'wp-includes/js/mediaelement/mediaelement-flash-video-hls.swf',
+	'wp-includes/js/mediaelement/mediaelement-flash-video-mdash.swf',
+	'wp-includes/js/mediaelement/mediaelement-flash-video.swf',
+	'wp-includes/js/mediaelement/renderers/dailymotion.js',
+	'wp-includes/js/mediaelement/renderers/dailymotion.min.js',
+	'wp-includes/js/mediaelement/renderers/facebook.js',
+	'wp-includes/js/mediaelement/renderers/facebook.min.js',
+	'wp-includes/js/mediaelement/renderers/soundcloud.js',
+	'wp-includes/js/mediaelement/renderers/soundcloud.min.js',
+	'wp-includes/js/mediaelement/renderers/twitch.js',
+	'wp-includes/js/mediaelement/renderers/twitch.min.js',
 );
 
 /**
@@ -1118,7 +1154,11 @@ function update_core($from, $to) {
 		$old_file = $to . $old_file;
 		if ( !$wp_filesystem->exists($old_file) )
 			continue;
-		$wp_filesystem->delete($old_file, true);
+
+		// If the file isn't deleted, try writing an empty string to the file instead.
+		if ( ! $wp_filesystem->delete( $old_file, true ) && $wp_filesystem->is_file( $old_file ) ) {
+			$wp_filesystem->put_contents( $old_file, '' );
+		}
 	}
 
 	// Remove any Genericons example.html's from the filesystem

diff --git a/wp-admin/js/editor.js b/wp-admin/js/editor.js
@@ -695,10 +695,10 @@ window.wp = window.wp || {};
 		 */
 		function findBookmarkedPosition( editor ) {
 			// Get the TinyMCE `window` reference, since we need to access the raw selection.
-			var TinyMCEWIndow = editor.getWin(),
-				selection = TinyMCEWIndow.getSelection();
+			var TinyMCEWindow = editor.getWin(),
+				selection = TinyMCEWindow.getSelection();
 
-			if ( selection.rangeCount <= 0 ) {
+			if ( ! selection || selection.rangeCount < 1 ) {
 				// no selection, no need to continue.
 				return;
 			}