Skip to content
This repository was archived by the owner on Jan 25, 2022. It is now read-only.

Commit a1689f2

Browse files
MickMakeMickMake
authored
Merge pull request #402 from wplib/0.16.1
0.16.1
2 parents 988b236 + d940ac9 commit a1689f2

File tree

173 files changed

+3790
-3375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+3790
-3375
lines changed

‎Vagrantfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,6 @@
367367
#
368368
# Ensure pre-requisites
369369
#
370-
371370
Vagrant.require_version ">= 2.1"
372371

373372
vboxmanage = Vagrant::Util::Which.which("VBoxManage") || Vagrant::Util::Which.which("VBoxManage.exe")

‎www/readme.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ <h2>System Requirements</h2>
5858

5959
<h3>Recommendations</h3>
6060
<ul>
61-
<li><a href="https://secure.php.net/">PHP</a> version <strong>7</strong> or higher.</li>
61+
<li><a href="https://secure.php.net/">PHP</a> version <strong>7.2</strong> or higher.</li>
6262
<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.6</strong> or higher.</li>
6363
<li>The <a href="https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
6464
<li><a href="https://wordpress.org/news/2016/12/moving-toward-ssl/">HTTPS</a> support.</li>

‎www/wp-activate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ function wpmu_activate_stylesheet() {
110110
printf(
111111
/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
112112
__( '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>.' ),
113-
sprintf( '<a href="http://%s">%s</a>', $signup->domain ),
113+
sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
114114
$signup->user_login,
115115
$signup->user_email,
116116
wp_lostpassword_url()

‎www/wp-admin/about.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,24 @@
3232

3333
<div class="changelog point-releases">
3434
<h3><?php _e( 'Maintenance and Security Releases' ); ?></h3>
35+
<p>
36+
<?php
37+
printf(
38+
/* translators: 1: WordPress version number, 2: plural number of bugs. */
39+
_n(
40+
'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
41+
'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
42+
28
43+
),
44+
'4.9.5',
45+
number_format_i18n( 28 )
46+
);
47+
?>
48+
<?php
49+
/* translators: %s: Codex URL */
50+
printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.5' );
51+
?>
52+
</p>
3553
<p>
3654
<?php
3755
printf(

‎www/wp-admin/css/about-rtl.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,8 @@
260260

261261
.about-wrap .two-col-text {
262262
-webkit-column-count: 2;
263-
-moz-column-count: 2;
264263
column-count: 2;
265264
-webkit-column-gap: 40px;
266-
-moz-column-gap: 40px;
267265
column-gap: 40px;
268266
}
269267

@@ -551,7 +549,6 @@
551549
@media screen and (max-width: 782px) {
552550
.about-wrap .two-col-text {
553551
-webkit-column-count: 1;
554-
-moz-column-count: 1;
555552
column-count: 1;
556553
}
557554

‎www/wp-admin/css/about-rtl.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/wp-admin/css/about.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,8 @@
260260

261261
.about-wrap .two-col-text {
262262
-webkit-column-count: 2;
263-
-moz-column-count: 2;
264263
column-count: 2;
265264
-webkit-column-gap: 40px;
266-
-moz-column-gap: 40px;
267265
column-gap: 40px;
268266
}
269267

@@ -551,7 +549,6 @@
551549
@media screen and (max-width: 782px) {
552550
.about-wrap .two-col-text {
553551
-webkit-column-count: 1;
554-
-moz-column-count: 1;
555552
column-count: 1;
556553
}
557554

‎www/wp-admin/css/about.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/wp-admin/css/common-rtl.css

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3943,23 +3943,6 @@ img {
39433943
}
39443944
}
39453945

3946-
.options-media-php br {
3947-
display: none;
3948-
}
3949-
3950-
@media screen and (max-width: 375px) {
3951-
.options-media-php input[type="number"][name*="_size_"] {
3952-
margin: 5px 0;
3953-
}
3954-
.options-media-php label[for*="_size_h"]:before {
3955-
content: '';
3956-
display: block;
3957-
}
3958-
.options-media-php br {
3959-
display: block;
3960-
}
3961-
}
3962-
39633946
@media screen and (max-width: 320px) {
39643947
/* Prevent default center alignment and larger font for the Right Now widget when
39653948
the network dashboard is viewed on a small mobile device. */

‎www/wp-admin/css/common-rtl.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/wp-admin/css/common.css

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3943,23 +3943,6 @@ img {
39433943
}
39443944
}
39453945

3946-
.options-media-php br {
3947-
display: none;
3948-
}
3949-
3950-
@media screen and (max-width: 375px) {
3951-
.options-media-php input[type="number"][name*="_size_"] {
3952-
margin: 5px 0;
3953-
}
3954-
.options-media-php label[for*="_size_h"]:before {
3955-
content: '';
3956-
display: block;
3957-
}
3958-
.options-media-php br {
3959-
display: block;
3960-
}
3961-
}
3962-
39633946
@media screen and (max-width: 320px) {
39643947
/* Prevent default center alignment and larger font for the Right Now widget when
39653948
the network dashboard is viewed on a small mobile device. */

‎www/wp-admin/css/common.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/wp-admin/css/forms-rtl.css

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,15 @@ fieldset label,
438438
vertical-align: middle;
439439
}
440440

441-
.options-media-php label[for*="_size_"],
441+
.options-media-php [for*="_size_"] {
442+
min-width: 10em;
443+
vertical-align: baseline;
444+
}
445+
446+
.options-media-php .small-text[name*="_size_"] {
447+
margin: 0 0 1em;
448+
}
449+
442450
#misc-publishing-actions label {
443451
vertical-align: baseline;
444452
}

‎www/wp-admin/css/forms-rtl.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/wp-admin/css/forms.css

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,15 @@ fieldset label,
438438
vertical-align: middle;
439439
}
440440

441-
.options-media-php label[for*="_size_"],
441+
.options-media-php [for*="_size_"] {
442+
min-width: 10em;
443+
vertical-align: baseline;
444+
}
445+
446+
.options-media-php .small-text[name*="_size_"] {
447+
margin: 0 0 1em;
448+
}
449+
442450
#misc-publishing-actions label {
443451
vertical-align: baseline;
444452
}

‎www/wp-admin/css/forms.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/wp-admin/css/login-rtl.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/wp-admin/css/login.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/wp-admin/css/nav-menus-rtl.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,8 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
785785
}
786786

787787
@media screen and ( max-width: 782px ) {
788-
body.nav-menus-php {
788+
body.nav-menus-php,
789+
body.wp-customizer {
789790
min-width: 0 !important;
790791
}
791792

‎www/wp-admin/css/nav-menus-rtl.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/wp-admin/css/nav-menus.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,8 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
785785
}
786786

787787
@media screen and ( max-width: 782px ) {
788-
body.nav-menus-php {
788+
body.nav-menus-php,
789+
body.wp-customizer {
789790
min-width: 0 !important;
790791
}
791792

‎www/wp-admin/css/nav-menus.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎www/wp-admin/custom-header.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ public function step_2() {
719719
check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
720720
if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
721721
wp_die(
722-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
722+
'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
723723
'<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
724724
403
725725
);
@@ -877,15 +877,15 @@ public function step_3() {
877877

878878
if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
879879
wp_die(
880-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
880+
'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
881881
'<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
882882
403
883883
);
884884
}
885885

886886
if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
887887
wp_die(
888-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
888+
'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
889889
'<p>' . __( 'The current theme does not support a flexible sized header image.' ) . '</p>',
890890
403
891891
);

‎www/wp-admin/customize.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
if ( ! current_user_can( 'customize' ) ) {
1616
wp_die(
17-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
17+
'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
1818
'<p>' . __( 'Sorry, you are not allowed to customize this site.' ) . '</p>',
1919
403
2020
);
@@ -31,7 +31,7 @@
3131

3232
if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $changeset_post->ID ) ) {
3333
wp_die(
34-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
34+
'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
3535
'<p>' . __( 'Sorry, you are not allowed to edit this changeset.' ) . '</p>',
3636
403
3737
);
@@ -76,7 +76,7 @@
7676

7777
if ( in_array( get_post_status( $changeset_post->ID ), array( 'publish', 'trash' ), true ) ) {
7878
wp_die(
79-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
79+
'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
8080
'<p>' . __( 'This changeset cannot be further modified.' ) . '</p>' .
8181
'<p><a href="' . esc_url( remove_query_arg( 'changeset_uuid' ) ) . '">' . __( 'Customize New Changes' ) . '</a></p>',
8282
403

‎www/wp-admin/edit-comments.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
require_once( dirname( __FILE__ ) . '/admin.php' );
1111
if ( ! current_user_can( 'edit_posts' ) ) {
1212
wp_die(
13-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
13+
'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
1414
'<p>' . __( 'Sorry, you are not allowed to edit comments.' ) . '</p>',
1515
403
1616
);

‎www/wp-admin/edit-tags.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
if ( ! current_user_can( $tax->cap->manage_terms ) ) {
2525
wp_die(
26-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
26+
'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
2727
'<p>' . __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ) . '</p>',
2828
403
2929
);
@@ -72,7 +72,7 @@
7272

7373
if ( ! current_user_can( $tax->cap->edit_terms ) ) {
7474
wp_die(
75-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
75+
'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
7676
'<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
7777
403
7878
);
@@ -96,7 +96,7 @@
9696

9797
if ( ! current_user_can( 'delete_term', $tag_ID ) ) {
9898
wp_die(
99-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
99+
'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
100100
'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
101101
403
102102
);
@@ -116,7 +116,7 @@
116116

117117
if ( ! current_user_can( $tax->cap->delete_terms ) ) {
118118
wp_die(
119-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
119+
'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
120120
'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
121121
403
122122
);
@@ -152,7 +152,7 @@
152152

153153
if ( ! current_user_can( 'edit_term', $tag_ID ) ) {
154154
wp_die(
155-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
155+
'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
156156
'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
157157
403
158158
);

‎www/wp-admin/edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {
3838
wp_die(
39-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
39+
'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
4040
'<p>' . __( 'Sorry, you are not allowed to edit posts in this post type.' ) . '</p>',
4141
403
4242
);

‎www/wp-admin/includes/bookmark.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function add_link() {
2828
function edit_link( $link_id = 0 ) {
2929
if ( ! current_user_can( 'manage_links' ) ) {
3030
wp_die(
31-
'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
31+
'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
3232
'<p>' . __( 'Sorry, you are not allowed to edit the links for this site.' ) . '</p>',
3333
403
3434
);

‎www/wp-admin/includes/class-wp-ms-users-list-table.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,10 @@ public function column_username( $user ) {
255255
public function column_name( $user ) {
256256
if ( $user->first_name && $user->last_name ) {
257257
echo "$user->first_name $user->last_name";
258+
} elseif ( $user->first_name ) {
259+
echo $user->first_name;
260+
} elseif ( $user->last_name ) {
261+
echo $user->last_name;
258262
} else {
259263
echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . _x( 'Unknown', 'name' ) . '</span>';
260264
}

‎www/wp-admin/includes/class-wp-users-list-table.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,10 @@ public function single_row( $user_object, $style = '', $role = '', $numposts = 0
488488
case 'name':
489489
if ( $user_object->first_name && $user_object->last_name ) {
490490
$r .= "$user_object->first_name $user_object->last_name";
491+
} elseif ( $user_object->first_name ) {
492+
$r .= $user_object->first_name;
493+
} elseif ( $user_object->last_name ) {
494+
$r .= $user_object->last_name;
491495
} else {
492496
$r .= '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . _x( 'Unknown', 'name' ) . '</span>';
493497
}

‎www/wp-admin/includes/file.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ function wp_edit_theme_plugin_file( $args ) {
589589
}
590590

591591
if ( ! isset( $result['message'] ) ) {
592-
$message = __( 'An unidentified error has occurred.' );
592+
$message = __( 'Something went wrong.' );
593593
} else {
594594
$message = $result['message'];
595595
unset( $result['message'] );

‎www/wp-admin/includes/image.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
241241
$sizes[ $s ]['crop'] = $_wp_additional_image_sizes[ $s ]['crop'];
242242
} else {
243243
// Force thumbnails to be soft crops.
244-
if ( ! 'thumbnail' === $s ) {
244+
if ( 'thumbnail' !== $s ) {
245245
$sizes[ $s ]['crop'] = get_option( "{$s}_crop" );
246246
}
247247
}

‎www/wp-admin/includes/misc.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,15 +1099,17 @@ function wp_admin_canonical_url() {
10991099
* @since 4.9.0
11001100
*/
11011101
function wp_admin_headers() {
1102-
$policy = 'same-origin';
1102+
$policy = 'strict-origin-when-cross-origin';
11031103

11041104
/**
1105-
* Filters the admin referrer policy header value. Default 'same-origin'.
1105+
* Filters the admin referrer policy header value.
11061106
*
11071107
* @since 4.9.0
1108+
* @since 4.9.5 The default value was changed to 'strict-origin-when-cross-origin'.
1109+
*
11081110
* @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy
11091111
*
1110-
* @param string $policy The referrer policy header value.
1112+
* @param string $policy The admin referrer policy header value. Default 'strict-origin-when-cross-origin'.
11111113
*/
11121114
$policy = apply_filters( 'admin_referrer_policy', $policy );
11131115

‎www/wp-admin/includes/theme.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,14 +687,14 @@ function customize_themes_print_templates() {
687687

688688
<div class="theme-actions">
689689
<# if ( data.active ) { #>
690-
<button type="button" class="button button-primary customize-theme"><?php _e( 'Customize' ); ?></a>
690+
<button type="button" class="button button-primary customize-theme"><?php _e( 'Customize' ); ?></button>
691691
<# } else if ( 'installed' === data.type ) { #>
692692
<?php if ( current_user_can( 'delete_themes' ) ) { ?>
693693
<# if ( data.actions && data.actions['delete'] ) { #>
694694
<a href="{{{ data.actions['delete'] }}}" data-slug="{{ data.id }}" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a>
695695
<# } #>
696696
<?php } ?>
697-
<button type="button" class="button button-primary preview-theme" data-slug="{{ data.id }}"><?php _e( 'Live Preview' ); ?></span>
697+
<button type="button" class="button button-primary preview-theme" data-slug="{{ data.id }}"><?php _e( 'Live Preview' ); ?></button>
698698
<# } else { #>
699699
<button type="button" class="button theme-install" data-slug="{{ data.id }}"><?php _e( 'Install' ); ?></button>
700700
<button type="button" class="button button-primary theme-install preview" data-slug="{{ data.id }}"><?php _e( 'Install &amp; Preview' ); ?></button>

0 commit comments

Comments
 (0)