update wordpress-4.9.5-ja

macminiosx · Apr 5, 2018 · 8dd4a5e · 8dd4a5e
1 parent c0d3b53
commit 8dd4a5e
Show file tree

Hide file tree

Showing 99 changed files with 627 additions and 570 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# WordPress 4.9.4-ja + pg4wp2 Heroku
+# WordPress 4.9.5-ja + pg4wp2 Heroku
 
 This project is a template for installing and running [WordPress](http://wordpress.org/) on [Heroku](http://www.heroku.com/). The repository comes bundled with:
 * [PostgreSQL for WordPress](http://wordpress.org/extend/plugins/postgresql-for-wordpress/)

diff --git a/app.json b/app.json
@@ -1,6 +1,6 @@
 {
     "name": "wordpress-ja-pg4wp2-heroku",
-    "description": "WordPress-4.9.4-ja pg4wp2 PostgreSQL on Heroku",
+    "description": "WordPress-4.9.5-ja pg4wp2 PostgreSQL on Heroku",
     "keywords": [
         "Blog",
         "PHP",

diff --git a/wp-activate.php b/wp-activate.php
@@ -110,7 +110,7 @@ function wpmu_activate_stylesheet() {
 					printf(
 						/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
 						__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-						sprintf( '<a href="http://%s">%s</a>', $signup->domain ),
+						sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
 						$signup->user_login,
 						$signup->user_email,
 						wp_lostpassword_url()

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.',
+						28
+					),
+					'4.9.5',
+					number_format_i18n( 28 )
+				);
+				?>
+				<?php
+				/* translators: %s: Codex URL */
+				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.5' );
+				?>
+			</p>
 			<p>
 				<?php
 				printf(

diff --git a/wp-admin/css/about-rtl.css b/wp-admin/css/about-rtl.css
@@ -260,10 +260,8 @@
 
 .about-wrap .two-col-text {
 	-webkit-column-count: 2;
-	-moz-column-count: 2;
 	column-count: 2;
 	-webkit-column-gap: 40px;
-	-moz-column-gap: 40px;
 	column-gap: 40px;
 }
 
@@ -551,7 +549,6 @@
 @media screen and (max-width: 782px) {
 	.about-wrap .two-col-text {
 		-webkit-column-count: 1;
-		-moz-column-count: 1;
 		column-count: 1;
 	}
 

diff --git a/wp-admin/css/about-rtl.min.css b/wp-admin/css/about-rtl.min.css
diff --git a/wp-admin/css/about.css b/wp-admin/css/about.css
@@ -260,10 +260,8 @@
 
 .about-wrap .two-col-text {
 	-webkit-column-count: 2;
-	-moz-column-count: 2;
 	column-count: 2;
 	-webkit-column-gap: 40px;
-	-moz-column-gap: 40px;
 	column-gap: 40px;
 }
 
@@ -551,7 +549,6 @@
 @media screen and (max-width: 782px) {
 	.about-wrap .two-col-text {
 		-webkit-column-count: 1;
-		-moz-column-count: 1;
 		column-count: 1;
 	}
 

diff --git a/wp-admin/css/about.min.css b/wp-admin/css/about.min.css
diff --git a/wp-admin/css/common-rtl.css b/wp-admin/css/common-rtl.css
@@ -3943,23 +3943,6 @@ img {
 	}
 }
 
-.options-media-php br {
-	display: none;
-}
-
-@media screen and (max-width: 375px) {
-	.options-media-php input[type="number"][name*="_size_"] {
-		margin: 5px 0;
-	}
-	.options-media-php label[for*="_size_h"]:before {
-		content: '';
-		display: block;
-	}
-	.options-media-php br {
-		display: block;
-	}
-}
-
 @media screen and (max-width: 320px) {
 	/* Prevent default center alignment and larger font for the Right Now widget when
 	   the network dashboard is viewed on a small mobile device. */

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
@@ -3943,23 +3943,6 @@ img {
 	}
 }
 
-.options-media-php br {
-	display: none;
-}
-
-@media screen and (max-width: 375px) {
-	.options-media-php input[type="number"][name*="_size_"] {
-		margin: 5px 0;
-	}
-	.options-media-php label[for*="_size_h"]:before {
-		content: '';
-		display: block;
-	}
-	.options-media-php br {
-		display: block;
-	}
-}
-
 @media screen and (max-width: 320px) {
 	/* Prevent default center alignment and larger font for the Right Now widget when
 	   the network dashboard is viewed on a small mobile device. */

diff --git a/wp-admin/css/common.min.css b/wp-admin/css/common.min.css
diff --git a/wp-admin/css/forms-rtl.css b/wp-admin/css/forms-rtl.css
@@ -438,7 +438,15 @@ fieldset label,
 	vertical-align: middle;
 }
 
-.options-media-php label[for*="_size_"],
+.options-media-php [for*="_size_"] {
+	min-width: 10em;
+	vertical-align: baseline;
+}
+
+.options-media-php .small-text[name*="_size_"] {
+	margin: 0 0 1em;
+}
+
 #misc-publishing-actions label {
 	vertical-align: baseline;
 }

diff --git a/wp-admin/css/forms-rtl.min.css b/wp-admin/css/forms-rtl.min.css
diff --git a/wp-admin/css/forms.css b/wp-admin/css/forms.css
@@ -438,7 +438,15 @@ fieldset label,
 	vertical-align: middle;
 }
 
-.options-media-php label[for*="_size_"],
+.options-media-php [for*="_size_"] {
+	min-width: 10em;
+	vertical-align: baseline;
+}
+
+.options-media-php .small-text[name*="_size_"] {
+	margin: 0 0 1em;
+}
+
 #misc-publishing-actions label {
 	vertical-align: baseline;
 }

diff --git a/wp-admin/css/forms.min.css b/wp-admin/css/forms.min.css
diff --git a/wp-admin/css/login-rtl.min.css b/wp-admin/css/login-rtl.min.css
diff --git a/wp-admin/css/login.min.css b/wp-admin/css/login.min.css
diff --git a/wp-admin/css/nav-menus-rtl.css b/wp-admin/css/nav-menus-rtl.css
@@ -785,7 +785,8 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
 }
 
 @media screen and ( max-width: 782px ) {
-	body.nav-menus-php {
+	body.nav-menus-php,
+	body.wp-customizer {
 		min-width: 0 !important;
 	}
 

diff --git a/wp-admin/css/nav-menus-rtl.min.css b/wp-admin/css/nav-menus-rtl.min.css
diff --git a/wp-admin/css/nav-menus.css b/wp-admin/css/nav-menus.css
@@ -785,7 +785,8 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
 }
 
 @media screen and ( max-width: 782px ) {
-	body.nav-menus-php {
+	body.nav-menus-php,
+	body.wp-customizer {
 		min-width: 0 !important;
 	}
 

diff --git a/wp-admin/css/nav-menus.min.css b/wp-admin/css/nav-menus.min.css
diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
@@ -719,7 +719,7 @@ public function step_2() {
 		check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
 		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
 				'<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
 				403
 			);
@@ -877,15 +877,15 @@ public function step_3() {
 
 		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
 				'<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
 				403
 			);
 		}
 
 		if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
 				'<p>' . __( 'The current theme does not support a flexible sized header image.' ) . '</p>',
 				403
 			);

diff --git a/wp-admin/customize.php b/wp-admin/customize.php
@@ -14,7 +14,7 @@
 
 if ( ! current_user_can( 'customize' ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to customize this site.' ) . '</p>',
 		403
 	);
@@ -31,7 +31,7 @@
 
 	if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $changeset_post->ID ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to edit this changeset.' ) . '</p>',
 			403
 		);
@@ -76,7 +76,7 @@
 
 	if ( in_array( get_post_status( $changeset_post->ID ), array( 'publish', 'trash' ), true ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
 			'<p>' . __( 'This changeset cannot be further modified.' ) . '</p>' .
 			'<p><a href="' . esc_url( remove_query_arg( 'changeset_uuid' ) ) . '">' . __( 'Customize New Changes' ) . '</a></p>',
 			403

diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
@@ -10,7 +10,7 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 if ( ! current_user_can( 'edit_posts' ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit comments.' ) . '</p>',
 		403
 	);

diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
@@ -23,7 +23,7 @@
 
 if ( ! current_user_can( $tax->cap->manage_terms ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ) . '</p>',
 		403
 	);
@@ -72,7 +72,7 @@
 
 	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
 			403
 		);
@@ -96,7 +96,7 @@
 
 	if ( ! current_user_can( 'delete_term', $tag_ID ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
 			403
 		);
@@ -116,7 +116,7 @@
 
 	if ( ! current_user_can( $tax->cap->delete_terms ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
 			403
 		);
@@ -152,7 +152,7 @@
 
 	if ( ! current_user_can( 'edit_term', $tag_ID ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
 			403
 		);

diff --git a/wp-admin/edit.php b/wp-admin/edit.php
@@ -36,7 +36,7 @@
 
 if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit posts in this post type.' ) . '</p>',
 		403
 	);

diff --git a/wp-admin/includes/bookmark.php b/wp-admin/includes/bookmark.php
@@ -28,7 +28,7 @@ function add_link() {
 function edit_link( $link_id = 0 ) {
 	if ( ! current_user_can( 'manage_links' ) ) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to edit the links for this site.' ) . '</p>',
 			403
 		);

diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -255,6 +255,10 @@ public function column_username( $user ) {
 	public function column_name( $user ) {
 		if ( $user->first_name && $user->last_name ) {
 			echo "$user->first_name $user->last_name";
+		} elseif ( $user->first_name ) {
+			echo $user->first_name;
+		} elseif ( $user->last_name ) {
+			echo $user->last_name;
 		} else {
 			echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . _x( 'Unknown', 'name' ) . '</span>';
 		}

diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php
@@ -488,6 +488,10 @@ public function single_row( $user_object, $style = '', $role = '', $numposts = 0
 					case 'name':
 						if ( $user_object->first_name && $user_object->last_name ) {
 							$r .= "$user_object->first_name $user_object->last_name";
+						} elseif ( $user_object->first_name ) {
+							$r .= $user_object->first_name;
+						} elseif ( $user_object->last_name ) {
+							$r .= $user_object->last_name;
 						} else {
 							$r .= '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . _x( 'Unknown', 'name' ) . '</span>';
 						}

diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
@@ -589,7 +589,7 @@ function wp_edit_theme_plugin_file( $args ) {
 			}
 
 			if ( ! isset( $result['message'] ) ) {
-				$message = __( 'An unidentified error has occurred.' );
+				$message = __( 'Something went wrong.' );
 			} else {
 				$message = $result['message'];
 				unset( $result['message'] );

diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php
@@ -241,7 +241,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 				$sizes[ $s ]['crop'] = $_wp_additional_image_sizes[ $s ]['crop'];
 			} else {
 				// Force thumbnails to be soft crops.
-				if ( ! 'thumbnail' === $s ) {
+				if ( 'thumbnail' !== $s ) {
 					$sizes[ $s ]['crop'] = get_option( "{$s}_crop" );
 				}
 			}

diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
@@ -1099,15 +1099,17 @@ function wp_admin_canonical_url() {
  * @since 4.9.0
  */
 function wp_admin_headers() {
-	$policy = 'same-origin';
+	$policy = 'strict-origin-when-cross-origin';
 
 	/**
-	 * Filters the admin referrer policy header value. Default 'same-origin'.
+	 * Filters the admin referrer policy header value.
 	 *
 	 * @since 4.9.0
+	 * @since 4.9.5 The default value was changed to 'strict-origin-when-cross-origin'.
+	 *
 	 * @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy
 	 *
-	 * @param string $policy The referrer policy header value.
+	 * @param string $policy The admin referrer policy header value. Default 'strict-origin-when-cross-origin'.
 	 */
 	$policy = apply_filters( 'admin_referrer_policy', $policy );
 

diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
@@ -687,14 +687,14 @@ function customize_themes_print_templates() {
 
 			<div class="theme-actions">
 				<# if ( data.active ) { #>
-					<button type="button" class="button button-primary customize-theme"><?php _e( 'Customize' ); ?></a>
+					<button type="button" class="button button-primary customize-theme"><?php _e( 'Customize' ); ?></button>
 				<# } else if ( 'installed' === data.type ) { #>
 					<?php if ( current_user_can( 'delete_themes' ) ) { ?>
 						<# if ( data.actions && data.actions['delete'] ) { #>
 							<a href="{{{ data.actions['delete'] }}}" data-slug="{{ data.id }}" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a>
 						<# } #>
 					<?php } ?>
-					<button type="button" class="button button-primary preview-theme" data-slug="{{ data.id }}"><?php _e( 'Live Preview' ); ?></span>
+					<button type="button" class="button button-primary preview-theme" data-slug="{{ data.id }}"><?php _e( 'Live Preview' ); ?></button>
 				<# } else { #>
 					<button type="button" class="button theme-install" data-slug="{{ data.id }}"><?php _e( 'Install' ); ?></button>
 					<button type="button" class="button button-primary theme-install preview" data-slug="{{ data.id }}"><?php _e( 'Install &amp; Preview' ); ?></button>