Commit 6b724c8f authored by kiki's avatar kiki

wordpress 4.9.6

parent edb38c6d
......@@ -58,7 +58,7 @@
<h3>Recommendations</h3>
<ul>
<li><a href="https://secure.php.net/">PHP</a> version <strong>7</strong> or higher.</li>
<li><a href="https://secure.php.net/">PHP</a> version <strong>7.2</strong> or higher.</li>
<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.6</strong> or higher.</li>
<li>The <a href="https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
<li><a href="https://wordpress.org/news/2016/12/moving-toward-ssl/">HTTPS</a> support.</li>
......
......@@ -18,6 +18,8 @@ if ( !is_multisite() ) {
die();
}
nocache_headers();
if ( is_object( $wp_object_cache ) )
$wp_object_cache->cache_enabled = false;
......@@ -110,7 +112,7 @@ get_header( 'wp-activate' );
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()
......
......@@ -27,11 +27,47 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<a href="about.php" class="nav-tab nav-tab-active"><?php _e( 'What&#8217;s New' ); ?></a>
<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
<a href="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
</h2>
<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 %2$s bug.',
'<strong>Version %1$s</strong> addressed %2$s bugs.',
18
),
'4.9.6',
number_format_i18n( 18 )
);
?>
<?php
/* translators: %s: Codex URL */
printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.6' );
?>
</p>
<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(
......
......@@ -65,6 +65,8 @@ $core_actions_post = array(
'generate-password', 'save-wporg-username', 'delete-plugin', 'search-plugins',
'search-install-plugins', 'activate-plugin', 'update-theme', 'delete-theme', 'install-theme',
'get-post-thumbnail-html', 'get-community-events', 'edit-theme-plugin-file',
'wp-privacy-export-personal-data',
'wp-privacy-erase-personal-data',
);
// Deprecated
......
......@@ -28,7 +28,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
<a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
<a href="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
</h2>
<div class="about-wrap-content">
......@@ -52,6 +52,12 @@ if ( ! $credits ) {
echo '<p class="about-description">' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "</p>\n";
echo '<p>' . sprintf(
/* translators: %s: https://make.wordpress.org/ */
__( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
__( 'https://make.wordpress.org/' )
) . '</p>';
foreach ( $credits['groups'] as $group_slug => $group_data ) {
if ( $group_data['name'] ) {
if ( 'Translators' == $group_data['name'] ) {
......@@ -101,13 +107,6 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
}
?>
<p class="clear"><?php
/* translators: %s: https://make.wordpress.org/ */
printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
__( 'https://make.wordpress.org/' )
);
?></p>
</div>
</div>
<?php
......
......@@ -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;
}
......
This diff is collapsed.
......@@ -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;
}
......
This diff is collapsed.
......@@ -2981,7 +2981,8 @@ img {
/* Metabox collapse arrow indicators */
.sidebar-name .toggle-indicator:before,
.js .meta-box-sortables .postbox .toggle-indicator:before,
.bulk-action-notice .toggle-indicator:before {
.bulk-action-notice .toggle-indicator:before,
.privacy-text-box .toggle-indicator:before {
content: "\f142";
display: inline-block;
font: normal 20px/1 dashicons;
......@@ -2993,7 +2994,8 @@ img {
.js .widgets-holder-wrap.closed .toggle-indicator:before,
.js .meta-box-sortables .postbox.closed .handlediv .toggle-indicator:before,
.bulk-action-notice .bulk-action-errors-collapsed .toggle-indicator:before {
.bulk-action-notice .bulk-action-errors-collapsed .toggle-indicator:before,
.privacy-text-box.closed .toggle-indicator:before {
content: "\f140";
}
......@@ -3943,23 +3945,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. */
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2981,7 +2981,8 @@ img {
/* Metabox collapse arrow indicators */
.sidebar-name .toggle-indicator:before,
.js .meta-box-sortables .postbox .toggle-indicator:before,
.bulk-action-notice .toggle-indicator:before {
.bulk-action-notice .toggle-indicator:before,
.privacy-text-box .toggle-indicator:before {
content: "\f142";
display: inline-block;
font: normal 20px/1 dashicons;
......@@ -2993,7 +2994,8 @@ img {
.js .widgets-holder-wrap.closed .toggle-indicator:before,
.js .meta-box-sortables .postbox.closed .handlediv .toggle-indicator:before,
.bulk-action-notice .bulk-action-errors-collapsed .toggle-indicator:before {
.bulk-action-notice .bulk-action-errors-collapsed .toggle-indicator:before,
.privacy-text-box.closed .toggle-indicator:before {
content: "\f140";
}
......@@ -3943,23 +3945,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. */
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -646,6 +646,93 @@ span.wp-media-buttons-icon:before {
margin-bottom: 20px;
}
/* Suggested text for privacy policy */
.wp-privacy-policy-guide {
max-width: 1000px;
}
.privacy-text-box {
width: calc(100% - 260px);
}
.privacy-text-box-toc {
float: left;
width: 250px;
background-color: #fff;
}
.privacy-text-box-toc p {
margin: 0;
padding: 0.7em 1em;
border-bottom: 1px solid #eee;
}
.privacy-text-box-toc ol {
margin-right: 2em;
}
.wp-privacy-policy-guide h3 {
font-size: 1.2em;
margin: 1em 0 0.5em;
}
.privacy-text-section .privacy-text-copy {
float: left;
}
.privacy-text-section {
position: relative;
border-top: 1px solid #e3e3e3;
}
.privacy-text-box-head,
.privacy-text-section.text-removed {
padding-bottom: 12px;
}
.text-removed .policy-text {
font-style: italic;
color: #666;
font-weight: 600;
}
.privacy-text-actions {
height: 32px;
line-height: 32px;
padding-bottom: 6px;
}
.wp-privacy-policy-guide .policy-text h2 {
margin: 1.2em 0 1em;
padding: 0;
}
.suggested-policy-content {
font-style: italic;
}
.privacy-text-section a.return-to-top {
float: left;
margin-left: -250px;
margin-top: 6px;
}
.hide-privacy-policy-tutorial .privacy-policy-tutorial {
visibility: hidden;
}
.wp-suggested-text p {
font-style: italic;
}
.wp-suggested-text p.privacy-policy-tutorial {
font-style: normal;
}
.notice.wp-pp-notice {
margin: 15px 0 3px;
}
/*------------------------------------------------------------------------------
11.1 - Custom Fields
------------------------------------------------------------------------------*/
......@@ -1570,4 +1657,19 @@ table.links-table {
.links-table td {
padding: 10px 0;
}
.privacy-text-box {
width: auto;
}
.privacy-text-box-toc {
float: none;
width: auto;
height: 100%;
}
.privacy-text-section a.return-to-top {
float: none;
margin: 0;
}
}
This diff is collapsed.
......@@ -646,6 +646,93 @@ span.wp-media-buttons-icon:before {
margin-bottom: 20px;
}
/* Suggested text for privacy policy */
.wp-privacy-policy-guide {
max-width: 1000px;
}
.privacy-text-box {
width: calc(100% - 260px);
}
.privacy-text-box-toc {
float: right;
width: 250px;
background-color: #fff;
}
.privacy-text-box-toc p {
margin: 0;
padding: 0.7em 1em;
border-bottom: 1px solid #eee;
}
.privacy-text-box-toc ol {
margin-left: 2em;
}
.wp-privacy-policy-guide h3 {
font-size: 1.2em;
margin: 1em 0 0.5em;
}
.privacy-text-section .privacy-text-copy {
float: right;
}
.privacy-text-section {
position: relative;
border-top: 1px solid #e3e3e3;
}
.privacy-text-box-head,
.privacy-text-section.text-removed {
padding-bottom: 12px;
}
.text-removed .policy-text {
font-style: italic;
color: #666;
font-weight: 600;
}
.privacy-text-actions {
height: 32px;
line-height: 32px;
padding-bottom: 6px;
}
.wp-privacy-policy-guide .policy-text h2 {
margin: 1.2em 0 1em;
padding: 0;
}
.suggested-policy-content {
font-style: italic;
}
.privacy-text-section a.return-to-top {
float: right;
margin-right: -250px;
margin-top: 6px;
}
.hide-privacy-policy-tutorial .privacy-policy-tutorial {
visibility: hidden;
}
.wp-suggested-text p {
font-style: italic;
}
.wp-suggested-text p.privacy-policy-tutorial {
font-style: normal;
}
.notice.wp-pp-notice {
margin: 15px 0 3px;
}
/*------------------------------------------------------------------------------
11.1 - Custom Fields
------------------------------------------------------------------------------*/
......@@ -1570,4 +1657,19 @@ table.links-table {
.links-table td {
padding: 10px 0;
}
.privacy-text-box {
width: auto;
}
.privacy-text-box-toc {
float: none;
width: auto;
height: 100%;
}
.privacy-text-section a.return-to-top {
float: none;
margin: 0;
}
}
This diff is collapsed.
......@@ -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;
}
......@@ -1068,6 +1076,143 @@ table.form-table td .updated p {
clear: both;
}
/*------------------------------------------------------------------------------
Privacy Policy settings screen
------------------------------------------------------------------------------*/
.tools-privacy-policy-page form {
margin-bottom: 1.3em;
}
.tools-privacy-policy-page input.button,
.tools-privacy-policy-page select {
margin-right: 6px;
}
.tools-privacy-edit {
margin: 1.5em 0;
}
.tools-privacy-policy-page span {
line-height: 2em;
}
.privacy_requests .column-email {
width: 40%;
}
.privacy_requests .column-type {
text-align: center;
}
.privacy_requests thead td:first-child,
.privacy_requests tfoot td:first-child {
border-right: 4px solid #fff;
}
.privacy_requests tbody th {
border-right: 4px solid #fff;
background: #fff;
box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
}
.privacy_requests tbody .has-request-results th {
box-shadow: none;
}
.privacy_requests tbody .request-results th .notice {
margin: 0 0 5px;
}
.privacy_requests tbody td {
background: #fff;
box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
}
.privacy_requests tbody .has-request-results td {
box-shadow: none;
}
.privacy_requests .next_steps .button {
height: auto;
line-height: 1.5;
padding: 4px 10px;
word-break: break-all;
white-space: unset;
}
.privacy_requests .status-request-confirmed th,
.privacy_requests .status-request-confirmed td {
background-color: #f7fcfe;
border-right-color: #00a0d2;
}
.privacy_requests .status-request-failed th,
.privacy_requests .status-request-failed td {
background-color: #fef7f1;
border-right-color: #d64d21;
}
.privacy_requests .export_personal_data_failed a {
vertical-align: baseline;
}
.status-label {
font-weight: bold;
}
.status-label.status-request-pending {
font-weight: normal;
font-style: italic;
color: #6c7781;
}
.status-label.status-request-failed {
color: #aa0000;
font-weight: bold;
}
.wp-privacy-request-form {
clear: both;
}
.wp-privacy-request-form-field {
margin: 1.5em 0;
}
.wp-privacy-request-form label {
font-weight: bold;
line-height: 1.5;
padding-bottom: .5em;
display: block;
}
.wp-privacy-request-form input {
line-height: 1.5;
margin: 0;
}
.email-personal-data::before {
display: inline-block;
font: normal 20px/1 dashicons;
margin: 3px -2px 0 5px;
speak: none;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
vertical-align: top;
}
.email-personal-data--sending::before {
color: #f56e28;
content: "\f463";
-webkit-animation: rotation 2s infinite linear;
animation: rotation 2s infinite linear;
}
.email-personal-data--sent::before {
color: #79ba49;
content: "\f147";
}
/* =Media Queries
-------------------------------------------------------------- */
......@@ -1345,6 +1490,34 @@ table.form-table td .updated p {
max-width: 6.25em;
margin: 0;
}
/* Privacy Policy settings screen */
.tools-privacy-policy-page form.wp-create-privacy-page {
margin-bottom: 1em;
}
.tools-privacy-policy-page input#set-page,
.tools-privacy-policy-page select {
margin: 10px 0 0;
}