@@ -88,7 +239,9 @@
-
+
+
+
@@ -116,7 +269,9 @@
-
+
+ + +
+
+
+
@@ -137,7 +292,9 @@
-
+
li.current > a.current:after {
/* rtl:ignore */
.folded #collapse-button .collapse-button-icon:after,
.rtl #collapse-button .collapse-button-icon:after {
- -webkit-transform: rotate(180deg);
transform: rotate(180deg);
}
.rtl.folded #collapse-button .collapse-button-icon:after {
- -webkit-transform: none;
transform: none;
}
@@ -728,12 +726,10 @@ li#wp-admin-bar-menu-toggle {
/* rtl:ignore */
.auto-fold #collapse-button .collapse-button-icon:after {
- -webkit-transform: rotate(180deg);
transform: rotate(180deg);
}
.rtl.auto-fold #collapse-button .collapse-button-icon:after {
- -webkit-transform: none;
transform: none;
}
diff --git a/src/wp-admin/css/code-editor.css b/src/wp-admin/css/code-editor.css
index 3c2f5e562f24f..c177a8b0cd0c0 100644
--- a/src/wp-admin/css/code-editor.css
+++ b/src/wp-admin/css/code-editor.css
@@ -70,3 +70,7 @@
.CodeMirror {
text-align: left;
}
+
+.wrap .CodeMirror .CodeMirror-linenumber {
+ color: #666;
+}
diff --git a/src/wp-admin/css/color-picker.css b/src/wp-admin/css/color-picker.css
index 00d7caf85cd34..477562308f714 100644
--- a/src/wp-admin/css/color-picker.css
+++ b/src/wp-admin/css/color-picker.css
@@ -50,7 +50,6 @@
.wp-color-result:active {
/* See Trac ticket #39662 */
- -webkit-transform: none !important;
transform: none !important;
}
diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index 038c6c82800de..1bfd133e4a396 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -860,7 +860,7 @@ hr {
#media-items a.delete,
#media-items a.delete-permanently,
#nav-menu-footer .menu-delete,
-#delete-link a.delete {
+#delete-link a.delete {
color: #a00;
}
@@ -1116,7 +1116,6 @@ th.action-links {
.wp-filter .button.drawer-toggle:active {
background: transparent;
box-shadow: none;
- -webkit-transform: none;
transform: none;
}
@@ -1188,11 +1187,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;
@@ -1499,7 +1506,6 @@ div.error {
.import-php .updating-message:before,
.button.updating-message:before,
.button.installing:before {
- -webkit-animation: rotation 2s infinite linear;
animation: rotation 2s infinite linear;
}
@@ -1672,7 +1678,6 @@ form.upgrade .hint {
#screen-meta-links .show-settings:active {
box-shadow: none;
- -webkit-transform: none;
transform: none;
}
@@ -2461,7 +2466,6 @@ div.star-holder .star-rating {
}
.rtl .star-rating .star-half {
- -webkit-transform: rotateY(180deg);
transform: rotateY(180deg);
}
@@ -2910,7 +2914,6 @@ div.action-links {
margin: -10px 0 0 -10px;
background: #fcfcfc url(../images/spinner.gif) no-repeat center;
background-size: 20px 20px;
- -webkit-transform: translateZ(0);
transform: translateZ(0);
}
@@ -2973,7 +2976,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;
@@ -2985,7 +2989,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";
}
@@ -3042,6 +3047,7 @@ img {
min-height: 60vh;
height: calc( 100vh - 295px );
border: 1px solid #ddd;
+ box-sizing: border-box;
}
#templateside > h2 {
@@ -3060,8 +3066,8 @@ img {
margin-top: 0;
overflow: auto;
padding: 0;
- min-height: calc(60vh + 2px);
- height: calc(100vh - 293px);
+ min-height: 60vh;
+ height: calc(100vh - 295px);
background-color: #f7f7f7;
border: 1px solid #ddd;
border-left: none;
@@ -3240,17 +3246,21 @@ img {
margin: 4px 0;
}
-#templateside li a,
+#templateside li:not(.howto) a,
.theme-editor-php .highlight {
display: block;
padding: 3px 0 3px 12px;
text-decoration: none;
}
-#templateside li > a:first-of-type {
+#templateside li:not(.howto) > a:first-of-type {
padding-top: 0;
}
+#templateside li.howto {
+ padding: 6px 12px 12px 12px;
+}
+
.theme-editor-php .highlight {
margin: -3px 3px -3px -12px;
}
@@ -3756,17 +3766,17 @@ img {
}
/* Theme/Plugin File Editor */
-
- #template textarea,
+
+ #template textarea,
#template .CodeMirror {
box-sizing: border-box;
}
-
+
#templateside {
float: none;
width: auto;
}
-
+
#templateside > ul {
border-left: 1px solid #ddd;
}
@@ -3775,10 +3785,13 @@ img {
margin: 0;
}
- #templateside li a {
+ #templateside li:not(.howto) a {
display: block;
padding: 5px;
}
+ #templateside li.howto {
+ padding: 12px;
+ }
#templateside .highlight {
padding: 5px;
@@ -3834,31 +3847,31 @@ img {
width: 100%;
text-align: left;
}
-
+
.fileedit-sub .alignright label {
display: block;
}
-
- .fileedit-sub #theme,
+
+ .fileedit-sub #theme,
.fileedit-sub #plugin {
margin-left: 0;
- max-width: 70%;
+ max-width: 70%;
}
-
+
.fileedit-sub input[type="submit"] {
margin-bottom: 0px;
padding: 8px 18px;
}
-
+
#documentation label[for="docs-list"] {
display: block;
}
-
+
#documentation select[name="docs-list"] {
margin-left: 0;
max-width: 60%;
}
-
+
#documentation input[type="button"] {
margin-bottom: 0;
padding: 8px 18px;
@@ -3881,6 +3894,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;
@@ -3923,23 +3940,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/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index d7d538739dcb9..a0f0612a51c1f 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -157,7 +157,6 @@ body:not(.ready) #customize-save-button-wrapper .save {
font-size: 14px;
width: 30px;
float: left;
- -webkit-transform: none;
transform: none;
margin-top: 0;
}
@@ -634,9 +633,7 @@ body.trashing #publish-settings {
margin: 0;
padding: 0;
box-sizing: border-box;
- transition: 0.18s -webkit-transform cubic-bezier(0.645, 0.045, 0.355, 1);
- transition: 0.18s transform cubic-bezier(0.645, 0.045, 0.355, 1);
- transition: 0.18s transform cubic-bezier(0.645, 0.045, 0.355, 1), 0.18s -webkit-transform cubic-bezier(0.645, 0.045, 0.355, 1); /* easeInOutCubic */
+ transition: 0.18s transform cubic-bezier(0.645, 0.045, 0.355, 1); /* easeInOutCubic */
}
#customize-theme-controls .customize-pane-child.skip-transition {
@@ -650,7 +647,6 @@ body.trashing #publish-settings {
height: auto;
max-height: none;
overflow: auto;
- -webkit-transform: none;
transform: none;
}
@@ -662,13 +658,11 @@ body.trashing #publish-settings {
height: 0;
max-height: none;
overflow: hidden;
- -webkit-transform: translateX(100%);
transform: translateX(100%);
}
#customize-theme-controls .customize-pane-child.open,
#customize-theme-controls .customize-pane-child.current-panel {
- -webkit-transform: none;
transform: none;
}
@@ -680,7 +674,6 @@ body.trashing #publish-settings {
visibility: hidden;
height: 0;
overflow: hidden;
- -webkit-transform: translateX(-100%);
transform: translateX(-100%);
}
@@ -1075,7 +1068,6 @@ p.customize-section-description {
bottom: 0;
z-index: 10;
background: #eee;
- display: -webkit-box;
display: flex;
}
@@ -1087,14 +1079,12 @@ p.customize-section-description {
#available-menu-items .new-content-item .create-item-input,
.customize-control-dropdown-pages .new-content-item .create-item-input {
- -webkit-box-flex: 10;
flex-grow: 10;
}
#available-menu-items .new-content-item .add-content,
.customize-control-dropdown-pages .new-content-item .add-content {
margin: 2px 0 2px 6px;
- -webkit-box-flex: 10;
flex-grow: 1;
}
@@ -1215,11 +1205,6 @@ p.customize-section-description {
margin-top: 1px;
}
-@-webkit-keyframes customize-fade-in {
- 0% { opacity: 0; }
- 100% { opacity: 1; }
-}
-
@keyframes customize-fade-in {
0% { opacity: 0; }
100% { opacity: 1; }
@@ -1232,7 +1217,6 @@ p.customize-section-description {
}
#customize-controls .customize-control-notifications-container.has-overlay-notifications {
- -webkit-animation: customize-fade-in 0.5s;
animation: customize-fade-in 0.5s;
z-index: 30;
}
@@ -1506,62 +1490,31 @@ p.customize-section-description {
.customize-control-header .placeholder:hover .dice,
.customize-control-header .header-view:hover > button.random .dice {
- -webkit-animation: dice-color-change 3s infinite;
animation: dice-color-change 3s infinite;
}
.button-see-me {
- -webkit-animation: bounce .7s 1;
animation: bounce .7s 1;
- -webkit-transform-origin: center bottom;
transform-origin: center bottom;
}
-@-webkit-keyframes bounce {
- from, 20%, 53%, 80%, to {
- -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
- -webkit-transform: translate3d(0,0,0);
- }
-
- 40%, 43% {
- -webkit-animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
- -webkit-transform: translate3d(0, -12px, 0);
- }
-
- 70% {
- -webkit-animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
- -webkit-transform: translate3d(0, -6px, 0);
- }
-
- 90% {
- -webkit-transform: translate3d(0,-1px,0);
- }
-}
-
@keyframes bounce {
from, 20%, 53%, 80%, to {
- -webkit-animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
animation-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
- -webkit-transform: translate3d(0,0,0);
transform: translate3d(0,0,0);
}
40%, 43% {
- -webkit-animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
- -webkit-transform: translate3d(0, -12px, 0);
transform: translate3d(0, -12px, 0);
}
70% {
- -webkit-animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
animation-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
- -webkit-transform: translate3d(0, -6px, 0);
transform: translate3d(0, -6px, 0);
}
90% {
- -webkit-transform: translate3d(0,-1px,0);
transform: translate3d(0,-1px,0);
}
}
@@ -1831,7 +1784,6 @@ p.customize-section-description {
background: #eee;
border-color: #999;
box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 );
- -webkit-transform: translateY(1px);
transform: translateY(1px);
}
@@ -1860,17 +1812,6 @@ p.customize-section-description {
}
/* Adds a delay before fading in to avoid it "jumping" */
-@-webkit-keyframes themes-fade-in {
- 0% {
- opacity: 0;
- }
- 50% {
- opacity: 0;
- }
- 100% {
- opacity: 1;
- }
-}
@keyframes themes-fade-in {
0% {
opacity: 0;
@@ -1884,12 +1825,10 @@ p.customize-section-description {
}
.control-panel-themes .customize-themes-full-container.animate {
- -webkit-animation: .6s themes-fade-in 1;
animation: .6s themes-fade-in 1;
}
.in-themes-panel:not(.animating) .control-panel-themes .filter-themes-count {
- -webkit-animation: .6s themes-fade-in 1;
animation: .6s themes-fade-in 1;
}
@@ -2575,7 +2514,6 @@ body.adding-widget .add-new-widget:hover,
body.adding-widget .add-new-widget:before,
.adding-menu-items .add-new-menu-item:before,
#accordion-section-add_menu .add-new-menu-item.open:before {
- -webkit-transform: rotate(45deg);
transform: rotate(45deg);
}
@@ -2706,6 +2644,7 @@ body.adding-widget .add-new-widget:before,
}
#available-menu-items-search .search-icon:after,
+#available-widgets-filter .search-icon:after,
.themes-filter-bar .search-icon:after {
content: "\f179";
font: normal 20px/1 dashicons;
diff --git a/src/wp-admin/css/customize-nav-menus.css b/src/wp-admin/css/customize-nav-menus.css
index 50f907aeb90a0..899c07877f26d 100644
--- a/src/wp-admin/css/customize-nav-menus.css
+++ b/src/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/src/wp-admin/css/dashboard.css b/src/wp-admin/css/dashboard.css
index f64cc92422e2d..14d6a36d3b096 100644
--- a/src/wp-admin/css/dashboard.css
+++ b/src/wp-admin/css/dashboard.css
@@ -141,6 +141,7 @@
.welcome-panel .welcome-panel-close {
position: absolute;
+ z-index: 10;
top: 10px;
right: 10px;
padding: 10px 15px 10px 21px;
@@ -165,7 +166,7 @@
}
.welcome-panel-content {
- margin-left: 13px;
+ margin: 0 13px;
max-width: 1500px;
}
@@ -202,7 +203,7 @@
}
.welcome-panel .welcome-panel-column ul {
- margin: 0.8em 1em 1em 0;
+ margin: 0.8em 1em 1em 0;
}
.welcome-panel .welcome-panel-column li {
@@ -1223,7 +1224,6 @@ a.rsswidget {
.welcome-panel .welcome-panel-column ul {
margin: 0.4em 0 0;
}
-
}
@media screen and ( max-width: 782px ) {
diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index 5f49475f5f37b..73b94cc59f0f2 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -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
------------------------------------------------------------------------------*/
@@ -1265,26 +1352,20 @@ table.links-table {
.focus-on #adminmenuback,
.focus-on #adminmenuwrap {
transition-duration: 0.6s;
- transition-property: -webkit-transform;
transition-property: transform;
- transition-property: transform, -webkit-transform;
transition-timing-function: ease-in-out;
}
.focus-on #adminmenuback,
.focus-on #adminmenuwrap {
- -webkit-transform: translateX( -100% );
transform: translateX( -100% );
}
.focus-off #adminmenuback,
.focus-off #adminmenuwrap {
- -webkit-transform: translateX( 0 );
transform: translateX( 0 );
transition-duration: 0.2s;
- transition-property: -webkit-transform;
transition-property: transform;
- transition-property: transform, -webkit-transform;
transition-timing-function: ease-in-out;
}
@@ -1570,4 +1651,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;
+ }
}
diff --git a/src/wp-admin/css/forms.css b/src/wp-admin/css/forms.css
index dac5fddf6513a..26fb35d8d10b4 100644
--- a/src/wp-admin/css/forms.css
+++ b/src/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;
}
@@ -826,13 +834,11 @@ table.form-table td .updated p {
right: 10px;
bottom: 9px;
background: transparent;
- -webkit-transform: skew(20deg) rotate(6deg);
transform: skew(20deg) rotate(6deg);
box-shadow: 0 10px 8px rgba(0, 0, 0, 0.6);
}
.pressthis-bookmarklet:hover:after {
- -webkit-transform: skew(20deg) rotate(9deg);
transform: skew(20deg) rotate(9deg);
box-shadow: 0 10px 8px rgba(0, 0, 0, 0.7);
}
@@ -897,7 +903,7 @@ table.form-table td .updated p {
.options-general-php .spinner {
float: none;
- margin: 0 3px;
+ margin: -3px 3px 0;
}
.settings-php .language-install-spinner,
@@ -1068,6 +1074,142 @@ 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-left: 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-left: 4px solid #fff;
+}
+
+.privacy_requests tbody th {
+ border-left: 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-left-color: #00a0d2;
+}
+
+.privacy_requests .status-request-failed th,
+.privacy_requests .status-request-failed td {
+ background-color: #fef7f1;
+ border-left-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 5px 0 -2px;
+ speak: none;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ vertical-align: top;
+}
+
+.email-personal-data--sending::before {
+ color: #f56e28;
+ content: "\f463";
+ animation: rotation 2s infinite linear;
+}
+
+.email-personal-data--sent::before {
+ color: #79ba49;
+ content: "\f147";
+}
+
/* =Media Queries
-------------------------------------------------------------- */
@@ -1345,6 +1487,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;
+ }
+
+ .tools-privacy-policy-page .wp-create-privacy-page span {
+ display: block;
+ margin-bottom: 1em;
+ }
+
+ .tools-privacy-policy-page .wp-create-privacy-page .button {
+ margin-left: 0;
+ }
+
+ .wp-list-table.privacy_requests tr:not(.inline-edit-row):not(.no-items) td.column-primary:not(.check-column) {
+ display: table-cell;
+ }
+
+ .wp-list-table.privacy_requests.widefat th input,
+ .wp-list-table.privacy_requests.widefat thead td input {
+ margin-left: 5px;
+ }
}
@media only screen and (max-width: 768px) {
@@ -1395,3 +1565,12 @@ table.form-table td .updated p {
margin-right: 0.5em;
}
}
+
+@keyframes rotation {
+ 0% {
+ transform: rotate(0deg);
+ }
+ 100% {
+ transform: rotate(359deg);
+ }
+}
diff --git a/src/wp-admin/css/list-tables.css b/src/wp-admin/css/list-tables.css
index 495c49b2fdf4a..73d5a733b75d7 100644
--- a/src/wp-admin/css/list-tables.css
+++ b/src/wp-admin/css/list-tables.css
@@ -1364,28 +1364,14 @@ ul.cat-checklist {
.plugin-card .updating-message:before {
content: "\f463";
- -webkit-animation: rotation 2s infinite linear;
animation: rotation 2s infinite linear;
}
-@-webkit-keyframes rotation {
- 0% {
- -webkit-transform: rotate(0deg);
- transform: rotate(0deg);
- }
- 100% {
- -webkit-transform: rotate(359deg);
- transform: rotate(359deg);
- }
-}
-
@keyframes rotation {
0% {
- -webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
- -webkit-transform: rotate(359deg);
transform: rotate(359deg);
}
}
diff --git a/src/wp-admin/css/login.css b/src/wp-admin/css/login.css
index 5da174cadc7f4..686be7dde920b 100644
--- a/src/wp-admin/css/login.css
+++ b/src/wp-admin/css/login.css
@@ -49,6 +49,7 @@ p {
}
.login .message,
+.login .success,
.login #login_error {
border-left: 4px solid #00a0d2;
padding: 12px;
@@ -58,6 +59,10 @@ p {
box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
}
+.login .success {
+ border-left-color: #46b450;
+}
+
.login #login_error {
border-left-color: #dc3232;
}
@@ -194,6 +199,12 @@ p {
color: #124964;
}
+.login .privacy-policy-page-link {
+ text-align: center;
+ width: 100%;
+ margin: 5em 0 2em;
+}
+
.login form .input,
.login input[type="text"] {
font-size: 24px;
diff --git a/src/wp-admin/css/media.css b/src/wp-admin/css/media.css
index 95e52acd82b5d..8c9b1cfa7c527 100644
--- a/src/wp-admin/css/media.css
+++ b/src/wp-admin/css/media.css
@@ -751,6 +751,10 @@ border color while dragging a file over the uploader drop area */
background-size: 20px 20px;
}
+.edit-attachment-frame .attachment-media-view .details-image.icon {
+ background: none;
+}
+
.edit-attachment-frame .attachment-media-view .attachment-actions {
text-align: center;
}
@@ -888,7 +892,6 @@ border color while dragging a file over the uploader drop area */
margin: -10px 0 0 -10px;
background: transparent url(../images/spinner.gif) no-repeat center;
background-size: 20px 20px;
- -webkit-transform: translateZ(0);
transform: translateZ(0);
}
diff --git a/src/wp-admin/css/nav-menus.css b/src/wp-admin/css/nav-menus.css
index 77c6274c24acc..4021b03b94d30 100644
--- a/src/wp-admin/css/nav-menus.css
+++ b/src/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/src/wp-admin/css/revisions.css b/src/wp-admin/css/revisions.css
index 236d76244afa1..c900a4998bc14 100644
--- a/src/wp-admin/css/revisions.css
+++ b/src/wp-admin/css/revisions.css
@@ -355,7 +355,6 @@ table.diff .diff-addedline ins {
top: -20px;
width: 25px;
height: 25px;
- -webkit-transform: rotate(45deg);
transform: rotate(45deg);
}
@@ -417,7 +416,6 @@ table.diff .diff-addedline ins {
top: -20px;
width: 25px;
height: 25px;
- -webkit-transform: rotate(45deg);
transform: rotate(45deg);
}
@@ -473,7 +471,6 @@ div.revisions-controls > .wp-slider > .ui-slider-handle {
background: #eee;
border-color: #999;
box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 );
- -webkit-transform: translateY(1px);
transform: translateY(1px);
}
diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css
index eece216a983d0..8d76be0df5491 100644
--- a/src/wp-admin/css/themes.css
+++ b/src/wp-admin/css/themes.css
@@ -230,7 +230,6 @@ body.js .theme-browser.search-loading {
.theme-browser .theme .theme-actions {
position: absolute;
top: 50%;
- -webkit-transform: translateY(-50%);
transform: translateY(-50%);
right: 0;
padding: 10px 15px;
@@ -1239,7 +1238,6 @@ div#custom-background-image img {
}
.background-position-control .button-group:first-child > label:first-child .dashicons {
- -webkit-transform: rotate( 45deg );
transform: rotate( 45deg );
}
@@ -1248,7 +1246,6 @@ div#custom-background-image img {
}
.background-position-control .button-group:first-child > label:last-child .dashicons {
- -webkit-transform: rotate( -45deg );
transform: rotate( -45deg );
}
@@ -1257,7 +1254,6 @@ div#custom-background-image img {
}
.background-position-control .button-group:last-child > label:first-child .dashicons {
- -webkit-transform: rotate( -45deg );
transform: rotate( -45deg );
}
@@ -1266,7 +1262,6 @@ div#custom-background-image img {
}
.background-position-control .button-group:last-child > label:last-child .dashicons {
- -webkit-transform: rotate( 45deg );
transform: rotate( 45deg );
}
@@ -1563,12 +1558,10 @@ body.full-overlay-active {
/* rtl:ignore */
.wp-full-overlay.collapsed .collapse-sidebar-arrow:before,
.rtl .wp-full-overlay .collapse-sidebar-arrow:before {
- -webkit-transform: rotate(180.001deg);
transform: rotate(180.001deg); /* Firefox: promoting to its own layer to trigger anti-aliasing */
}
.rtl .wp-full-overlay.collapsed .collapse-sidebar-arrow:before {
- -webkit-transform: none;
transform: none;
}
@@ -1854,7 +1847,6 @@ body.full-overlay-active {
top: 50%;
z-index: -1;
margin: -10px 0 0 -10px;
- -webkit-transform: translateZ(0);
transform: translateZ(0);
background: transparent url(../images/spinner.gif) no-repeat center center;
background-size: 20px 20px;
diff --git a/src/wp-admin/css/widgets.css b/src/wp-admin/css/widgets.css
index 9576be2fc622c..f8c1ad07e89f9 100644
--- a/src/wp-admin/css/widgets.css
+++ b/src/wp-admin/css/widgets.css
@@ -154,7 +154,8 @@
top: 30px;
}
-.media-frame #embed-url-field.invalid {
+.media-frame #embed-url-field.invalid,
+.media-widget-image-link > .link:invalid {
border: 1px solid #dc3232;
}
@@ -163,9 +164,7 @@
}
.media-widget-gallery-preview {
- display: -webkit-box;
display: flex;
- -webkit-box-pack: start;
justify-content: flex-start;
flex-wrap: wrap;
margin: -1.79104477%;
@@ -176,9 +175,7 @@
cursor: pointer;
}
-.media-widget-preview.media_image,
-.media-widget-preview.media_audio,
-.attachment-media-view {
+.media-widget-preview .placeholder {
background: #f1f1f1;
}
@@ -189,7 +186,7 @@
background: transparent;
}
-.media-widget-gallery-preview .gallery-item .gallery-icon {
+.media-widget-gallery-preview .gallery-item .gallery-icon {
margin: 4.5%;
}
@@ -222,11 +219,8 @@
bottom: 0;
width: 100%;
box-sizing: border-box;
- display: -webkit-box;
display: flex;
- -webkit-box-align: center;
align-items: center;
- -webkit-box-pack: center;
justify-content: center;
background-color: rgba( 0, 0, 0, .5 );
}
diff --git a/src/wp-admin/custom-header.php b/src/wp-admin/custom-header.php
index 71561332e0754..d345766afa4f0 100644
--- a/src/wp-admin/custom-header.php
+++ b/src/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(
- '
+
+
@@ -242,34 +399,78 @@
offset += $adminbar.height();
}
- var adjustScrollClass = _.throttle( function adjustScrollClass() {
+ function setup() {
+ $sections.each( function( i, section ) {
+ var $section = $( section );
+ // If the title is long, switch the layout
+ var $title = $section.find( 'h2' );
+ if ( $title.innerWidth() > 300 ) {
+ $section.addClass( 'has-long-title' );
+ }
+ } );
+ }
+
+ var adjustScrollPosition = _.throttle( function adjustScrollPosition() {
$sections.each( function( i, section ) {
var $section = $( section );
var $header = $section.find( 'h2' );
var width = $header.innerWidth();
+ var height = $header.innerHeight();
+
+ if ( $section.hasClass( 'has-long-title' ) ) {
+ return;
+ }
var sectionStart = $section.offset().top - offset;
- var sectionEnd = sectionStart + $section.innerHeight() - 60;
+ var sectionEnd = sectionStart + $section.innerHeight();
+ var scrollPos = $window.scrollTop();
// If we're scrolled into a section, stick the header
- if ( $window.scrollTop() >= sectionStart && $window.scrollTop() < sectionEnd ) {
- $header.addClass( 'header-fixed' );
- $header.css( { top: offset + 'px', width: width + 'px' } );
+ if ( scrollPos >= sectionStart && scrollPos < sectionEnd - height ) {
+ $header.css( {
+ position: 'fixed',
+ top: offset + 'px',
+ bottom: 'auto',
+ width: width + 'px'
+ } );
+ // If we're at the end of the section, stick the header to the bottom
+ } else if ( scrollPos >= sectionEnd - height && scrollPos < sectionEnd ) {
+ $header.css( {
+ position: 'absolute',
+ top: 'auto',
+ bottom: 0,
+ width: width + 'px'
+ } );
+ // Unstick the header
} else {
- $header.removeClass( 'header-fixed' );
- $header.css( { top: 0, width: 'auto' } );
+ $header.css( {
+ position: 'static',
+ top: 'auto',
+ bottom: 'auto',
+ width: 'auto'
+ } );
}
} );
}, 100 );
+
function enableFixedHeaders() {
if ( $window.width() > 782 ) {
- adjustScrollClass();
- $window.on( 'scroll', adjustScrollClass );
+ setup();
+ adjustScrollPosition();
+ $window.on( 'scroll', adjustScrollPosition );
} else {
- $window.off( 'scroll', adjustScrollClass );
+ $window.off( 'scroll', adjustScrollPosition );
+ $sections.find( '.section-header' )
+ .css( {
+ width: 'auto'
+ } );
$sections.find( 'h2' )
- .removeClass( 'header-fixed' )
- .css( { top: 0, width: 'auto' } );
+ .css( {
+ position: 'static',
+ top: 'auto',
+ bottom: 'auto',
+ width: 'auto'
+ } );
}
}
$( window ).resize( enableFixedHeaders );
diff --git a/src/wp-admin/admin-ajax.php b/src/wp-admin/admin-ajax.php
index 8a1533254fbb5..cbef0787dbc31 100644
--- a/src/wp-admin/admin-ajax.php
+++ b/src/wp-admin/admin-ajax.php
@@ -65,6 +65,8 @@
'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
diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php
index d5ceeccd61bbc..158be6297bbbb 100644
--- a/src/wp-admin/admin-header.php
+++ b/src/wp-admin/admin-header.php
@@ -175,6 +175,15 @@
$admin_body_class .= ' no-customize-support no-svg';
+if ( $current_screen->is_block_editor() ) {
+ // Default to is-fullscreen-mode to avoid jumps in the UI.
+ $admin_body_class .= ' block-editor-page is-fullscreen-mode wp-embed-responsive';
+
+ if ( current_theme_supports( 'editor-styles' ) && current_theme_supports( 'dark-editor-style' ) ) {
+ $admin_body_class .= ' is-dark-theme';
+ }
+}
+
?>
-
+
@@ -28,7 +28,7 @@
-
+
@@ -52,6 +52,12 @@
echo '
' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "
\n"; +echo '' . sprintf( + /* translators: %s: https://make.wordpress.org/ */ + __( 'Want to see your name in lights on this page? Get involved in WordPress.' ), + __( 'https://make.wordpress.org/' ) +) . '
'; + foreach ( $credits['groups'] as $group_slug => $group_data ) { if ( $group_data['name'] ) { if ( 'Translators' == $group_data['name'] ) { @@ -101,13 +107,6 @@ } ?> -Get involved in WordPress.' ), - __( 'https://make.wordpress.org/' ) - ); -?>
-' . __( 'Cheatin’ uh?' ) . '
' . + '' . __( 'Something went wrong.' ) . '
' . '' . __( 'The current theme does not support uploading a custom header image.' ) . '
', 403 ); @@ -877,7 +877,7 @@ public function step_3() { if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) { wp_die( - '' . __( 'Cheatin’ uh?' ) . '
' . + '' . __( 'Something went wrong.' ) . '
' . '' . __( 'The current theme does not support uploading a custom header image.' ) . '
', 403 ); @@ -885,7 +885,7 @@ public function step_3() { if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) { wp_die( - '' . __( 'Cheatin’ uh?' ) . '
' . + '' . __( 'Something went wrong.' ) . '
' . '' . __( 'The current theme does not support a flexible sized header image.' ) . '
', 403 ); diff --git a/src/wp-admin/customize.php b/src/wp-admin/customize.php index 7f9e5a9dc7952..d98c2a1718bb7 100644 --- a/src/wp-admin/customize.php +++ b/src/wp-admin/customize.php @@ -14,7 +14,7 @@ if ( ! current_user_can( 'customize' ) ) { wp_die( - '' . __( 'Cheatin’ uh?' ) . '
' . + '' . __( 'You need a higher level of permission.' ) . '
' . '' . __( 'Sorry, you are not allowed to customize this site.' ) . '
', 403 ); @@ -31,7 +31,7 @@ if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $changeset_post->ID ) ) { wp_die( - '' . __( 'Cheatin’ uh?' ) . '
' . + '' . __( 'You need a higher level of permission.' ) . '
' . '' . __( 'Sorry, you are not allowed to edit this changeset.' ) . '
', 403 ); @@ -42,18 +42,42 @@ get_post_time( 'G', true, $changeset_post ) < time() ); if ( $missed_schedule ) { - wp_publish_post( $changeset_post->ID ); + /* + * Note that an Ajax request spawns here instead of just calling `wp_publish_post( $changeset_post->ID )`. + * + * Because WP_Customize_Manager is not instantiated for customize.php with the `settings_previewed=false` + * argument, settings cannot be reliably saved. Some logic short-circuits if the current value is the + * same as the value being saved. This is particularly true for options via `update_option()`. + * + * By opening an Ajax request, this is avoided and the changeset is published. See #39221. + */ + $nonces = $wp_customize->get_nonces(); + $request_args = array( + 'nonce' => $nonces['save'], + 'customize_changeset_uuid' => $wp_customize->changeset_uuid(), + 'wp_customize' => 'on', + 'customize_changeset_status' => 'publish', + ); + ob_start(); + ?> + + + ' . __( 'Your scheduled changes just published' ) . '' . - '' . __( 'Customize New Changes' ) . '
', + '' . __( 'Customize New Changes' ) . '
' . $script, 200 ); } if ( in_array( get_post_status( $changeset_post->ID ), array( 'publish', 'trash' ), true ) ) { wp_die( - '' . __( 'Cheatin’ uh?' ) . '
' . - '' . __( 'This changeset has already been published and cannot be further modified.' ) . '
' . + '' . __( 'Something went wrong.' ) . '
' . + '' . __( 'This changeset cannot be further modified.' ) . '
' . '' . __( 'Customize New Changes' ) . '
', 403 ); diff --git a/src/wp-admin/edit-comments.php b/src/wp-admin/edit-comments.php index 47244f025e834..4076bf2d9eba5 100644 --- a/src/wp-admin/edit-comments.php +++ b/src/wp-admin/edit-comments.php @@ -10,7 +10,7 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); if ( ! current_user_can( 'edit_posts' ) ) { wp_die( - '' . __( 'Cheatin’ uh?' ) . '
' . + '' . __( 'You need a higher level of permission.' ) . '
' . '' . __( 'Sorry, you are not allowed to edit comments.' ) . '
', 403 ); diff --git a/src/wp-admin/edit-form-advanced.php b/src/wp-admin/edit-form-advanced.php index 07c2dfe129c16..9e8da8588d989 100644 --- a/src/wp-admin/edit-form-advanced.php +++ b/src/wp-admin/edit-form-advanced.php @@ -226,33 +226,33 @@ require_once( ABSPATH . 'wp-admin/includes/meta-boxes.php' ); -$publish_callback_args = null; +$publish_callback_args = array( '__back_compat_meta_box' => true ); if ( post_type_supports($post_type, 'revisions') && 'auto-draft' != $post->post_status ) { $revisions = wp_get_post_revisions( $post_ID ); // We should aim to show the revisions meta box only when there are revisions. if ( count( $revisions ) > 1 ) { reset( $revisions ); // Reset pointer for key() - $publish_callback_args = array( 'revisions_count' => count( $revisions ), 'revision_id' => key( $revisions ) ); - add_meta_box('revisionsdiv', __('Revisions'), 'post_revisions_meta_box', null, 'normal', 'core'); + $publish_callback_args = array( 'revisions_count' => count( $revisions ), 'revision_id' => key( $revisions ), '__back_compat_meta_box' => true ); + add_meta_box('revisionsdiv', __('Revisions'), 'post_revisions_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) ); } } if ( 'attachment' == $post_type ) { wp_enqueue_script( 'image-edit' ); wp_enqueue_style( 'imgareaselect' ); - add_meta_box( 'submitdiv', __('Save'), 'attachment_submit_meta_box', null, 'side', 'core' ); + add_meta_box( 'submitdiv', __('Save'), 'attachment_submit_meta_box', null, 'side', 'core', array( '__back_compat_meta_box' => true ) ); add_action( 'edit_form_after_title', 'edit_form_image_editor' ); if ( wp_attachment_is( 'audio', $post ) ) { - add_meta_box( 'attachment-id3', __( 'Metadata' ), 'attachment_id3_data_meta_box', null, 'normal', 'core' ); + add_meta_box( 'attachment-id3', __( 'Metadata' ), 'attachment_id3_data_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) ); } } else { add_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', null, 'side', 'core', $publish_callback_args ); } if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) ) - add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', null, 'side', 'core' ); + add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', null, 'side', 'core', array( '__back_compat_meta_box' => true ) ); // all taxonomies foreach ( get_object_taxonomies( $post ) as $tax_name ) { @@ -267,24 +267,24 @@ else $tax_meta_box_id = $tax_name . 'div'; - add_meta_box( $tax_meta_box_id, $label, $taxonomy->meta_box_cb, null, 'side', 'core', array( 'taxonomy' => $tax_name ) ); + add_meta_box( $tax_meta_box_id, $label, $taxonomy->meta_box_cb, null, 'side', 'core', array( 'taxonomy' => $tax_name, '__back_compat_meta_box' => true ) ); } if ( post_type_supports( $post_type, 'page-attributes' ) || count( get_page_templates( $post ) ) > 0 ) { - add_meta_box( 'pageparentdiv', $post_type_object->labels->attributes, 'page_attributes_meta_box', null, 'side', 'core' ); + add_meta_box( 'pageparentdiv', $post_type_object->labels->attributes, 'page_attributes_meta_box', null, 'side', 'core', array( '__back_compat_meta_box' => true ) ); } if ( $thumbnail_support && current_user_can( 'upload_files' ) ) - add_meta_box('postimagediv', esc_html( $post_type_object->labels->featured_image ), 'post_thumbnail_meta_box', null, 'side', 'low'); + add_meta_box('postimagediv', esc_html( $post_type_object->labels->featured_image ), 'post_thumbnail_meta_box', null, 'side', 'low', array( '__back_compat_meta_box' => true ) ); if ( post_type_supports($post_type, 'excerpt') ) - add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', null, 'normal', 'core'); + add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) ); if ( post_type_supports($post_type, 'trackbacks') ) - add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', null, 'normal', 'core'); + add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) ); if ( post_type_supports($post_type, 'custom-fields') ) - add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core'); + add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) ); /** * Fires in the middle of built-in meta box registration. @@ -299,7 +299,7 @@ // Allow the Discussion meta box to show up if the post type supports comments, // or if comments or pings are open. if ( comments_open( $post ) || pings_open( $post ) || post_type_supports( $post_type, 'comments' ) ) { - add_meta_box( 'commentstatusdiv', __( 'Discussion' ), 'post_comment_status_meta_box', null, 'normal', 'core' ); + add_meta_box( 'commentstatusdiv', __( 'Discussion' ), 'post_comment_status_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) ); } $stati = get_post_stati( array( 'public' => true ) ); @@ -312,15 +312,15 @@ // If the post type support comments, or the post has comments, allow the // Comments meta box. if ( comments_open( $post ) || pings_open( $post ) || $post->comment_count > 0 || post_type_supports( $post_type, 'comments' ) ) { - add_meta_box( 'commentsdiv', __( 'Comments' ), 'post_comment_meta_box', null, 'normal', 'core' ); + add_meta_box( 'commentsdiv', __( 'Comments' ), 'post_comment_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) ); } } if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) - add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core'); + add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) ); if ( post_type_supports( $post_type, 'author' ) && current_user_can( $post_type_object->cap->edit_others_posts ) ) { - add_meta_box( 'authordiv', __( 'Author' ), 'post_author_meta_box', null, 'normal', 'core' ); + add_meta_box( 'authordiv', __( 'Author' ), 'post_author_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) ); } /** @@ -639,7 +639,7 @@ 'resize' => false, 'wp_autoresize_on' => $_wp_editor_expand, 'add_unload_trigger' => false, - 'wp_keep_scroll_position' => true, + 'wp_keep_scroll_position' => ! $is_IE, ), ) ); ?>| ' . esc_html( $group_item_datum['name'] ) . ' | '; + $group_html .= '' . wp_kses( $value, $allowed_tags, $allowed_protocols ) . ' | '; + $group_html .= '
|---|
" . esc_html__( 'Personal Data Export' ) . "
" ); + + // And now, all the Groups. + $groups = get_post_meta( $request_id, '_export_data_grouped', true ); + + // First, build an "About" group on the fly for this report. + $about_group = array( + /* translators: Header for the About section in a personal data export. */ + 'group_label' => _x( 'About', 'personal data group label' ), + 'items' => array( + 'about-1' => array( + array( + 'name' => _x( 'Report generated for', 'email address' ), + 'value' => $email_address, + ), + array( + 'name' => _x( 'For site', 'website name' ), + 'value' => get_bloginfo( 'name' ), + ), + array( + 'name' => _x( 'At URL', 'website URL' ), + 'value' => get_bloginfo( 'url' ), + ), + array( + 'name' => _x( 'On', 'date/time' ), + 'value' => current_time( 'mysql' ), + ), + ), + ), + ); + + // Merge in the special about group. + $groups = array_merge( array( 'about' => $about_group ), $groups ); + + // Now, iterate over every group in $groups and have the formatter render it in HTML. + foreach ( (array) $groups as $group_id => $group_data ) { + fwrite( $file, wp_privacy_generate_personal_data_export_group_html( $group_data ) ); + } + + fwrite( $file, "\n" ); + + // Close HTML. + fwrite( $file, "\n" ); + fclose( $file ); + + /* + * Now, generate the ZIP. + * + * If an archive has already been generated, then remove it and reuse the + * filename, to avoid breaking any URLs that may have been previously sent + * via email. + */ + $error = false; + $archive_url = get_post_meta( $request_id, '_export_file_url', true ); + $archive_pathname = get_post_meta( $request_id, '_export_file_path', true ); + + if ( empty( $archive_pathname ) || empty( $archive_url ) ) { + $archive_filename = $file_basename . '.zip'; + $archive_pathname = $exports_dir . $archive_filename; + $archive_url = $exports_url . $archive_filename; + + update_post_meta( $request_id, '_export_file_url', $archive_url ); + update_post_meta( $request_id, '_export_file_path', wp_normalize_path( $archive_pathname ) ); + } + + if ( ! empty( $archive_pathname ) && file_exists( $archive_pathname ) ) { + wp_delete_file( $archive_pathname ); + } + + $zip = new ZipArchive; + if ( true === $zip->open( $archive_pathname, ZipArchive::CREATE ) ) { + if ( ! $zip->addFile( $html_report_pathname, 'index.html' ) ) { + $error = __( 'Unable to add data to export file.' ); + } + + $zip->close(); + + if ( ! $error ) { + /** + * Fires right after all personal data has been written to the export file. + * + * @since 4.9.6 + * + * @param string $archive_pathname The full path to the export file on the filesystem. + * @param string $archive_url The URL of the archive file. + * @param string $html_report_pathname The full path to the personal data report on the filesystem. + * @param int $request_id The export request ID. + */ + do_action( 'wp_privacy_personal_data_export_file_created', $archive_pathname, $archive_url, $html_report_pathname, $request_id ); + } + } else { + $error = __( 'Unable to open export file (archive) for writing.' ); + } + + // And remove the HTML file. + unlink( $html_report_pathname ); + + if ( $error ) { + wp_send_json_error( $error ); + } +} + +/** + * Send an email to the user with a link to the personal data export file + * + * @since 4.9.6 + * + * @param int $request_id The request ID for this personal data export. + * @return true|WP_Error True on success or `WP_Error` on failure. + */ +function wp_privacy_send_personal_data_export_email( $request_id ) { + // Get the request data. + $request = wp_get_user_request_data( $request_id ); + + if ( ! $request || 'export_personal_data' !== $request->action_name ) { + return new WP_Error( 'invalid', __( 'Invalid request ID when sending personal data export email.' ) ); + } + + /** This filter is documented in wp-includes/functions.php */ + $expiration = apply_filters( 'wp_privacy_export_expiration', 3 * DAY_IN_SECONDS ); + $expiration_date = date_i18n( get_option( 'date_format' ), time() + $expiration ); + +/* translators: Do not translate EXPIRATION, LINK, SITENAME, SITEURL: those are placeholders. */ +$email_text = __( +'Howdy, + +Your request for an export of personal data has been completed. You may +download your personal data by clicking on the link below. For privacy +and security, we will automatically delete the file on ###EXPIRATION###, +so please download it before then. + +###LINK### + +Regards, +All at ###SITENAME### +###SITEURL###' +); + + /** + * Filters the text of the email sent with a personal data export file. + * + * The following strings have a special meaning and will get replaced dynamically: + * ###EXPIRATION### The date when the URL will be automatically deleted. + * ###LINK### URL of the personal data export file for the user. + * ###SITENAME### The name of the site. + * ###SITEURL### The URL to the site. + * + * @since 4.9.6 + * + * @param string $email_text Text in the email. + * @param int $request_id The request ID for this personal data export. + */ + $content = apply_filters( 'wp_privacy_personal_data_email_content', $email_text, $request_id ); + + $email_address = $request->email; + $export_file_url = get_post_meta( $request_id, '_export_file_url', true ); + $site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ); + $site_url = home_url(); + + $content = str_replace( '###EXPIRATION###', $expiration_date, $content ); + $content = str_replace( '###LINK###', esc_url_raw( $export_file_url ), $content ); + $content = str_replace( '###EMAIL###', $email_address, $content ); + $content = str_replace( '###SITENAME###', $site_name, $content ); + $content = str_replace( '###SITEURL###', esc_url_raw( $site_url ), $content ); + + $mail_success = wp_mail( + $email_address, + sprintf( + __( '[%s] Personal Data Export' ), + $site_name + ), + $content + ); + + if ( ! $mail_success ) { + return new WP_Error( 'error', __( 'Unable to send personal data export email.' ) ); + } + + return true; +} + +/** + * Intercept personal data exporter page ajax responses in order to assemble the personal data export file. + * @see wp_privacy_personal_data_export_page + * @since 4.9.6 + * + * @param array $response The response from the personal data exporter for the given page. + * @param int $exporter_index The index of the personal data exporter. Begins at 1. + * @param string $email_address The email address of the user whose personal data this is. + * @param int $page The page of personal data for this exporter. Begins at 1. + * @param int $request_id The request ID for this personal data export. + * @param bool $send_as_email Whether the final results of the export should be emailed to the user. + * @param string $exporter_key The slug (key) of the exporter. + * @return array The filtered response. + */ +function wp_privacy_process_personal_data_export_page( $response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key ) { + /* Do some simple checks on the shape of the response from the exporter. + * If the exporter response is malformed, don't attempt to consume it - let it + * pass through to generate a warning to the user by default ajax processing. + */ + if ( ! is_array( $response ) ) { + return $response; + } + + if ( ! array_key_exists( 'done', $response ) ) { + return $response; + } + + if ( ! array_key_exists( 'data', $response ) ) { + return $response; + } + + if ( ! is_array( $response['data'] ) ) { + return $response; + } + + // Get the request data. + $request = wp_get_user_request_data( $request_id ); + + if ( ! $request || 'export_personal_data' !== $request->action_name ) { + wp_send_json_error( __( 'Invalid request ID when merging exporter data.' ) ); + } + + $export_data = array(); + + // First exporter, first page? Reset the report data accumulation array. + if ( 1 === $exporter_index && 1 === $page ) { + update_post_meta( $request_id, '_export_data_raw', $export_data ); + } else { + $export_data = get_post_meta( $request_id, '_export_data_raw', true ); + } + + // Now, merge the data from the exporter response into the data we have accumulated already. + $export_data = array_merge( $export_data, $response['data'] ); + update_post_meta( $request_id, '_export_data_raw', $export_data ); + + // If we are not yet on the last page of the last exporter, return now. + /** This filter is documented in wp-admin/includes/ajax-actions.php */ + $exporters = apply_filters( 'wp_privacy_personal_data_exporters', array() ); + $is_last_exporter = $exporter_index === count( $exporters ); + $exporter_done = $response['done']; + if ( ! $is_last_exporter || ! $exporter_done ) { + return $response; + } + + // Last exporter, last page - let's prepare the export file. + + // First we need to re-organize the raw data hierarchically in groups and items. + $groups = array(); + foreach ( (array) $export_data as $export_datum ) { + $group_id = $export_datum['group_id']; + $group_label = $export_datum['group_label']; + if ( ! array_key_exists( $group_id, $groups ) ) { + $groups[ $group_id ] = array( + 'group_label' => $group_label, + 'items' => array(), + ); + } + + $item_id = $export_datum['item_id']; + if ( ! array_key_exists( $item_id, $groups[ $group_id ]['items'] ) ) { + $groups[ $group_id ]['items'][ $item_id ] = array(); + } + + $old_item_data = $groups[ $group_id ]['items'][ $item_id ]; + $merged_item_data = array_merge( $export_datum['data'], $old_item_data ); + $groups[ $group_id ]['items'][ $item_id ] = $merged_item_data; + } + + // Then save the grouped data into the request. + delete_post_meta( $request_id, '_export_data_raw' ); + update_post_meta( $request_id, '_export_data_grouped', $groups ); + + /** + * Generate the export file from the collected, grouped personal data. + * + * @since 4.9.6 + * + * @param int $request_id The export request ID. + */ + do_action( 'wp_privacy_personal_data_export_file', $request_id ); + + // Clear the grouped data now that it is no longer needed. + delete_post_meta( $request_id, '_export_data_grouped' ); + + // If the destination is email, send it now. + if ( $send_as_email ) { + $mail_success = wp_privacy_send_personal_data_export_email( $request_id ); + if ( is_wp_error( $mail_success ) ) { + wp_send_json_error( $mail_success->get_error_message() ); + } + } else { + // Modify the response to include the URL of the export file so the browser can fetch it. + $export_file_url = get_post_meta( $request_id, '_export_file_url', true ); + if ( ! empty( $export_file_url ) ) { + $response['url'] = $export_file_url; + } + } + + // Update the request to completed state. + _wp_privacy_completed_request( $request_id ); + + return $response; +} diff --git a/src/wp-admin/includes/image.php b/src/wp-admin/includes/image.php index 8282499e8fae7..d33f7539f9d60 100644 --- a/src/wp-admin/includes/image.php +++ b/src/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" ); } } @@ -343,7 +343,7 @@ function wp_read_image_metadata( $file ) { if ( ! file_exists( $file ) ) return false; - list( , , $sourceImageType ) = getimagesize( $file ); + list( , , $image_type ) = @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] ) ) { @@ -420,6 +420,8 @@ function wp_read_image_metadata( $file ) { } } + $exif = array(); + /** * Filters the image types to check for exif data. * @@ -427,7 +429,9 @@ function wp_read_image_metadata( $file ) { * * @param array $image_types Image types to check for exif data. */ - if ( is_callable( 'exif_read_data' ) && in_array( $sourceImageType, apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) ) ) ) { + $exif_image_types = apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) ); + + if ( is_callable( 'exif_read_data' ) && in_array( $image_type, $exif_image_types ) ) { $exif = @exif_read_data( $file ); if ( ! empty( $exif['ImageDescription'] ) ) { @@ -505,13 +509,15 @@ function wp_read_image_metadata( $file ) { * * @since 2.5.0 * @since 4.4.0 The `$iptc` parameter was added. + * @since 5.0.0 The `$exif` parameter was added. * - * @param array $meta Image meta data. - * @param string $file Path to image file. - * @param int $sourceImageType Type of image. - * @param array $iptc IPTC data. + * @param array $meta Image meta data. + * @param string $file Path to image file. + * @param int $image_type Type of image, one of the `IMAGETYPE_XXX` constants. + * @param array $iptc IPTC data. + * @param array $exif EXIF data. */ - return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType, $iptc ); + return apply_filters( 'wp_read_image_metadata', $meta, $file, $image_type, $iptc, $exif ); } diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php index 2ee607d2d56ca..aa9b7dd6fd633 100644 --- a/src/wp-admin/includes/media.php +++ b/src/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/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php index 605242df8ebcb..a8cfd161d7565 100644 --- a/src/wp-admin/includes/meta-boxes.php +++ b/src/wp-admin/includes/meta-boxes.php @@ -903,7 +903,7 @@ function page_attributes_meta_box($post) { /** * Fires before the help hint text in the 'Page Attributes' meta box. * - * @since 4.8.0 + * @since 4.9.0 * * @param WP_Post $post The current post. */ diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php index 7f5952c895ef1..3c414a857a567 100644 --- a/src/wp-admin/includes/misc.php +++ b/src/wp-admin/includes/misc.php @@ -77,12 +77,12 @@ function extract_from_markers( $filename, $marker ) { foreach ( $markerdata as $markerline ) { if ( false !== strpos( $markerline, '# END ' . $marker ) ) { $state = false; - if ( $state ) { - $result[] = $markerline; - } - if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) { - $state = true; - } + } + if ( $state ) { + $result[] = $markerline; + } + if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) { + $state = true; } } @@ -194,6 +194,8 @@ function insert_with_markers( $filename, $marker, $insertion ) { * @since 1.5.0 * * @global WP_Rewrite $wp_rewrite + * + * @return bool|null True on write success, false on failure. Null in multisite. */ function save_mod_rewrite_rules() { if ( is_multisite() ) @@ -201,8 +203,11 @@ function save_mod_rewrite_rules() { global $wp_rewrite; - $home_path = get_home_path(); - $htaccess_file = $home_path.'.htaccess'; + // Ensure get_home_path() is declared. + require_once( ABSPATH . 'wp-admin/includes/file.php' ); + + $home_path = get_home_path(); + $htaccess_file = $home_path . '.htaccess'; /* * If the file doesn't already exist check for write access to the directory @@ -226,7 +231,7 @@ function save_mod_rewrite_rules() { * * @global WP_Rewrite $wp_rewrite * - * @return bool True if web.config was updated successfully + * @return bool|null True on write success, false on failure. Null in multisite. */ function iis7_save_url_rewrite_rules(){ if ( is_multisite() ) @@ -234,7 +239,10 @@ function iis7_save_url_rewrite_rules(){ global $wp_rewrite; - $home_path = get_home_path(); + // Ensure get_home_path() is declared. + require_once( ABSPATH . 'wp-admin/includes/file.php' ); + + $home_path = get_home_path(); $web_config_file = $home_path . 'web.config'; // Using win_is_writable() instead of is_writable() because of a bug in Windows PHP @@ -598,6 +606,8 @@ function set_screen_options() { case 'upload_per_page': case 'edit_tags_per_page': case 'plugins_per_page': + case 'export_personal_data_requests_per_page': + case 'remove_personal_data_requests_per_page': // Network admin case 'sites_network_per_page': case 'users_network_per_page': @@ -1099,15 +1109,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 ); @@ -1148,7 +1160,7 @@ function update_option_new_admin_email( $old_value, $value ) { return; } - $hash = md5( $value . time() . mt_rand() ); + $hash = md5( $value . time() . wp_rand() ); $new_admin_email = array( 'hash' => $hash, 'newemail' => $value, @@ -1211,3 +1223,652 @@ function update_option_new_admin_email( $old_value, $value ) { restore_previous_locale(); } } + +/** + * Appends '(Draft)' to draft page titles in the privacy page dropdown + * so that unpublished content is obvious. + * + * @since 4.9.8 + * @access private + * + * @param string $title Page title. + * @param WP_Post $page Page data object. + * + * @return string Page title. + */ +function _wp_privacy_settings_filter_draft_page_titles( $title, $page ) { + if ( 'draft' === $page->post_status && 'privacy' === get_current_screen()->id ) { + /* translators: %s: Page Title */ + $title = sprintf( __( '%s (Draft)' ), $title ); + } + + return $title; +} + +/** + * WP_Privacy_Policy_Content class. + * TODO: move this to a new file. + * + * @since 4.9.6 + */ +final class WP_Privacy_Policy_Content { + + private static $policy_content = array(); + + /** + * Constructor + * + * @since 4.9.6 + */ + private function __construct() {} + + /** + * Add content to the postbox shown when editing the privacy policy. + * + * Plugins and themes should suggest text for inclusion in the site's privacy policy. + * The suggested text should contain information about any functionality that affects user privacy, + * and will be shown in the Suggested Privacy Policy Content postbox. + * + * Intended for use from `wp_add_privacy_policy_content()`. + * + * @since 4.9.6 + * + * @param string $plugin_name The name of the plugin or theme that is suggesting content for the site's privacy policy. + * @param string $policy_text The suggested content for inclusion in the policy. + */ + public static function add( $plugin_name, $policy_text ) { + if ( empty( $plugin_name ) || empty( $policy_text ) ) { + return; + } + + $data = array( + 'plugin_name' => $plugin_name, + 'policy_text' => $policy_text, + ); + + if ( ! in_array( $data, self::$policy_content, true ) ) { + self::$policy_content[] = $data; + } + } + + /** + * Quick check if any privacy info has changed. + * + * @since 4.9.6 + */ + public static function text_change_check() { + + $policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' ); + + // The site doesn't have a privacy policy. + if ( empty( $policy_page_id ) ) { + return false; + } + + if ( ! current_user_can( 'edit_post', $policy_page_id ) ) { + return false; + } + + $old = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' ); + + // Updates are not relevant if the user has not reviewed any suggestions yet. + if ( empty( $old ) ) { + return false; + } + + $cached = get_option( '_wp_suggested_policy_text_has_changed' ); + + /* + * When this function is called before `admin_init`, `self::$policy_content` + * has not been populated yet, so use the cached result from the last + * execution instead. + */ + if ( ! did_action( 'admin_init' ) ) { + return 'changed' === $cached; + } + + $new = self::$policy_content; + + // Remove the extra values added to the meta. + foreach ( $old as $key => $data ) { + if ( ! empty( $data['removed'] ) ) { + unset( $old[ $key ] ); + continue; + } + + $old[ $key ] = array( + 'plugin_name' => $data['plugin_name'], + 'policy_text' => $data['policy_text'], + ); + } + + // Normalize the order of texts, to facilitate comparison. + sort( $old ); + sort( $new ); + + // The == operator (equal, not identical) was used intentionally. + // See http://php.net/manual/en/language.operators.array.php + if ( $new != $old ) { + // A plugin was activated or deactivated, or some policy text has changed. + // Show a notice on the relevant screens to inform the admin. + add_action( 'admin_notices', array( 'WP_Privacy_Policy_Content', 'policy_text_changed_notice' ) ); + $state = 'changed'; + } else { + $state = 'not-changed'; + } + + // Cache the result for use before `admin_init` (see above). + if ( $cached !== $state ) { + update_option( '_wp_suggested_policy_text_has_changed', $state ); + } + + return 'changed' === $state; + } + + /** + * Output a warning when some privacy info has changed. + * + * @since 4.9.6 + */ + public static function policy_text_changed_notice() { + global $post; + + $screen = get_current_screen()->id; + + if ( 'privacy' !== $screen ) { + return; + } + + ?> +
+
+ $old_data ) {
+ if ( ! empty( $old_data['removed'] ) ) {
+ // Remove the old policy text.
+ $update_cache = true;
+ continue;
+ }
+
+ if ( ! empty( $old_data['updated'] ) ) {
+ // 'updated' is now 'added'.
+ $done[] = array(
+ 'plugin_name' => $old_data['plugin_name'],
+ 'policy_text' => $old_data['policy_text'],
+ 'added' => $old_data['updated'],
+ );
+ $update_cache = true;
+ } else {
+ $done[] = $old_data;
+ }
+ }
+
+ if ( $update_cache ) {
+ delete_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
+ // Update the cache.
+ foreach ( $done as $data ) {
+ add_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content', $data );
+ }
+ }
+ }
+
+ /**
+ * Check for updated, added or removed privacy policy information from plugins.
+ *
+ * Caches the current info in post_meta of the policy page.
+ *
+ * @since 4.9.6
+ *
+ * @return array The privacy policy text/informtion added by core and plugins.
+ */
+ public static function get_suggested_policy_text() {
+ $policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
+ $checked = array();
+ $time = time();
+ $update_cache = false;
+ $new = self::$policy_content;
+ $old = array();
+
+ if ( $policy_page_id ) {
+ $old = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
+ }
+
+ // Check for no-changes and updates.
+ foreach ( $new as $new_key => $new_data ) {
+ foreach ( $old as $old_key => $old_data ) {
+ $found = false;
+
+ if ( $new_data['policy_text'] === $old_data['policy_text'] ) {
+ // Use the new plugin name in case it was changed, translated, etc.
+ if ( $old_data['plugin_name'] !== $new_data['plugin_name'] ) {
+ $old_data['plugin_name'] = $new_data['plugin_name'];
+ $update_cache = true;
+ }
+
+ // A plugin was re-activated.
+ if ( ! empty( $old_data['removed'] ) ) {
+ unset( $old_data['removed'] );
+ $old_data['added'] = $time;
+ $update_cache = true;
+ }
+
+ $checked[] = $old_data;
+ $found = true;
+ } elseif ( $new_data['plugin_name'] === $old_data['plugin_name'] ) {
+ // The info for the policy was updated.
+ $checked[] = array(
+ 'plugin_name' => $new_data['plugin_name'],
+ 'policy_text' => $new_data['policy_text'],
+ 'updated' => $time,
+ );
+ $found = $update_cache = true;
+ }
+
+ if ( $found ) {
+ unset( $new[ $new_key ], $old[ $old_key ] );
+ continue 2;
+ }
+ }
+ }
+
+ if ( ! empty( $new ) ) {
+ // A plugin was activated.
+ foreach ( $new as $new_data ) {
+ if ( ! empty( $new_data['plugin_name'] ) && ! empty( $new_data['policy_text'] ) ) {
+ $new_data['added'] = $time;
+ $checked[] = $new_data;
+ }
+ }
+ $update_cache = true;
+ }
+
+ if ( ! empty( $old ) ) {
+ // A plugin was deactivated.
+ foreach ( $old as $old_data ) {
+ if ( ! empty( $old_data['plugin_name'] ) && ! empty( $old_data['policy_text'] ) ) {
+ $data = array(
+ 'plugin_name' => $old_data['plugin_name'],
+ 'policy_text' => $old_data['policy_text'],
+ 'removed' => $time,
+ );
+
+ $checked[] = $data;
+ }
+ }
+ $update_cache = true;
+ }
+
+ if ( $update_cache && $policy_page_id ) {
+ delete_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
+ // Update the cache.
+ foreach ( $checked as $data ) {
+ add_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content', $data );
+ }
+ }
+
+ return $checked;
+ }
+
+ /**
+ * Add a notice with a link to the guide when editing the privacy policy page.
+ *
+ * @since 4.9.6
+ *
+ * @param WP_Post $post The currently edited post.
+ */
+ public static function notice( $post ) {
+ if ( ! ( $post instanceof WP_Post ) ) {
+ return;
+ }
+
+ if ( ! current_user_can( 'manage_privacy_options' ) ) {
+ return;
+ }
+
+ $policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
+
+ if ( ! $policy_page_id || $policy_page_id != $post->ID ) {
+ return;
+ }
+
+ ?>
+ review the guide and update your privacy policy.' ), + esc_url( admin_url( 'tools.php?wp-privacy-policy-guide=1' ) ) + ); + ?>
+
+
+ ' . __( 'Introduction' ) . '' );
+ $date_format = __( 'F j, Y' );
+ $copy = __( 'Copy' );
+ $return_to_top = '' . __( '↑ Return to Top' ) . '';
+
+ foreach ( $content_array as $section ) {
+ $class = $meta = $removed = '';
+
+ if ( ! empty( $section['removed'] ) ) {
+ $class = ' text-removed';
+ $date = date_i18n( $date_format, $section['removed'] );
+ $meta = sprintf( __( 'Removed %s.' ), $date );
+
+ $removed = __( 'You deactivated this plugin on %s and may no longer need this policy.' );
+ $removed = '+ Check out our guide%3$s for recommendations on what content to include, along with policies suggested by your plugins and theme.' ), + admin_url( 'tools.php?wp-privacy-policy-guide=1' ), + 'target="_blank"', + sprintf( + ' %s', + /* translators: accessibility text */ + __( '(opens in a new tab)' ) + ) + ); + ?> +
+' . sprintf( $removed, $date ) . '
'; + } + + $plugin_name = esc_html( $section['plugin_name'] ); + $toc_id = 'wp-privacy-policy-guide-' . sanitize_title( $plugin_name ); + $toc[] = sprintf( '
';
+ $content .= ' ';
+ /* translators: %s: plugin name */
+ $content .= '
\n"; // End of .privacy-text-section.
+ }
+
+ if ( count( $toc ) > 2 ) {
+ ?>
+ ' . sprintf( __( 'Source: %s' ), $plugin_name ) . '
'; + $content .= $removed; + + $content .= '' . $section['policy_text'] . '
';
+ $content .= $return_to_top;
+
+ if ( empty( $section['removed'] ) ) {
+ $content .= '';
+ $content .= '';
+ $content .= '
';
+ }
+
+ $content .= "
+
+
+
+
+ ' . __( 'Suggested text:' ) . ' ' : '';
+ $content = '';
+ $strings = array();
+
+ // Start of the suggested privacy policy text.
+ if ( $description ) {
+ $strings[] = '-
+
+
';
+ }
+
+ $strings[] = '
';
+ }
+
+ if ( $blocks ) {
+ foreach ( $strings as $key => $string ) {
+ if ( 0 === strpos( $string, '' . __( 'Who we are' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'In this section you should note your site URL, as well as the name of the company, organization, or individual behind it, and some accurate contact information.' ) . '
'; + $strings[] = '' . __( 'The amount of information you may be required to show will vary depending on your local or national business regulations. You may, for example, be required to display a physical address, a registered address, or your company registration number.' ) . '
'; + } + + /* translators: %s Site URL */ + $strings[] = '' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '
'; + + $strings[] = '' . __( 'What personal data we collect and why we collect it' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'In this section you should note what personal data you collect from users and site visitors. This may include personal data, such as name, email address, personal account preferences; transactional data, such as purchase information; and technical data, such as information about cookies.' ) . '
'; + $strings[] = '' . __( 'You should also note any collection and retention of sensitive personal data, such as data concerning health.' ) . '
'; + $strings[] = '' . __( 'In addition to listing what personal data you collect, you need to note why you collect it. These explanations must note either the legal basis for your data collection and retention or the active consent the user has given.' ) . '
'; + $strings[] = '' . __( 'Personal data is not just created by a user’s interactions with your site. Personal data is also generated from technical processes such as contact forms, comments, cookies, analytics, and third party embeds.' ) . '
'; + $strings[] = '' . __( 'By default WordPress does not collect any personal data about visitors, and only collects the data shown on the User Profile screen from registered users. However some of your plugins may collect personal data. You should add the relevant information below.' ) . '
'; + } + + $strings[] = '' . __( 'Comments' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'In this subsection you should note what information is captured through comments. We have noted the data which WordPress collects by default.' ) . '
'; + } + + $strings[] = '' . $suggested_text . __( 'When visitors leave comments on the site we collect the data shown in the comments form, and also the visitor’s IP address and browser user agent string to help spam detection.' ) . '
'; + $strings[] = '' . __( 'An anonymized string created from your email address (also called a hash) may be provided to the Gravatar service to see if you are using it. The Gravatar service privacy policy is available here: https://automattic.com/privacy/. After approval of your comment, your profile picture is visible to the public in the context of your comment.' ) . '
'; + $strings[] = '' . __( 'Media' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'In this subsection you should note what information may be disclosed by users who can upload media files. All uploaded files are usually publicly accessible.' ) . '
'; + } + + $strings[] = '' . $suggested_text . __( 'If you upload images to the website, you should avoid uploading images with embedded location data (EXIF GPS) included. Visitors to the website can download and extract any location data from images on the website.' ) . '
'; + $strings[] = '' . __( 'Contact forms' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'By default, WordPress does not include a contact form. If you use a contact form plugin, use this subsection to note what personal data is captured when someone submits a contact form, and how long you keep it. For example, you may note that you keep contact form submissions for a certain period for customer service purposes, but you do not use the information submitted through them for marketing purposes.' ) . '
'; + } + + $strings[] = '' . __( 'Cookies' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'In this subsection you should list the cookies your web site uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '
'; + } + + $strings[] = '' . $suggested_text . __( 'If you leave a comment on our site you may opt-in to saving your name, email address and website in cookies. These are for your convenience so that you do not have to fill in your details again when you leave another comment. These cookies will last for one year.' ) . '
'; + $strings[] = '' . __( 'If you have an account and you log in to this site, we will set a temporary cookie to determine if your browser accepts cookies. This cookie contains no personal data and is discarded when you close your browser.' ) . '
'; + $strings[] = '' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and screen options cookies last for a year. If you select "Remember Me", your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '
'; + $strings[] = '' . __( 'If you edit or publish an article, an additional cookie will be saved in your browser. This cookie includes no personal data and simply indicates the post ID of the article you just edited. It expires after 1 day.' ) . '
'; + + $strings[] = '' . __( 'Embedded content from other websites' ) . '
'; + $strings[] = '' . $suggested_text . __( 'Articles on this site may include embedded content (e.g. videos, images, articles, etc.). Embedded content from other websites behaves in the exact same way as if the visitor has visited the other website.' ) . '
'; + $strings[] = '' . __( 'These websites may collect data about you, use cookies, embed additional third-party tracking, and monitor your interaction with that embedded content, including tracking your interaction with the embedded content if you have an account and are logged in to that website.' ) . '
'; + + $strings[] = '' . __( 'Analytics' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'In this subsection you should note what analytics package you use, how users can opt out of analytics tracking, and a link to your analytics provider’s privacy policy, if any.' ) . '
'; + $strings[] = '' . __( 'By default WordPress does not collect any analytics data. However, many web hosting accounts collect some anonymous analytics data. You may also have installed a WordPress plugin that provides analytics services. In that case, add information from that plugin here.' ) . '
'; + } + + $strings[] = '' . __( 'Who we share your data with' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'In this section you should name and list all third party providers with whom you share site data, including partners, cloud-based services, payment processors, and third party service providers, and note what data you share with them and why. Link to their own privacy policies if possible.' ) . '
'; + $strings[] = '' . __( 'By default WordPress does not share any personal data with anyone.' ) . '
'; + } + + $strings[] = '' . __( 'How long we retain your data' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'In this section you should explain how long you retain personal data collected or processed by the web site. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '
'; + } + + $strings[] = '' . $suggested_text . __( 'If you leave a comment, the comment and its metadata are retained indefinitely. This is so we can recognize and approve any follow-up comments automatically instead of holding them in a moderation queue.' ) . '
'; + $strings[] = '' . __( 'For users that register on our website (if any), we also store the personal information they provide in their user profile. All users can see, edit, or delete their personal information at any time (except they cannot change their username). Website administrators can also see and edit that information.' ) . '
'; + + $strings[] = '' . __( 'What rights you have over your data' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'In this section you should explain what rights your users have over their data and how they can invoke those rights.' ) . '
'; + } + + $strings[] = '' . $suggested_text . __( 'If you have an account on this site, or have left comments, you can request to receive an exported file of the personal data we hold about you, including any data you have provided to us. You can also request that we erase any personal data we hold about you. This does not include any data we are obliged to keep for administrative, legal, or security purposes.' ) . '
'; + + $strings[] = '' . __( 'Where we send your data' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'In this section you should list all transfers of your site data outside the European Union and describe the means by which that data is safeguarded to European data protection standards. This could include your web hosting, cloud storage, or other third party services.' ) . '
'; + $strings[] = '' . __( 'European data protection law requires data about European residents which is transferred outside the European Union to be safeguarded to the same standards as if the data was in Europe. So in addition to listing where data goes, you should describe how you ensure that these standards are met either by yourself or by your third party providers, whether that is through an agreement such as Privacy Shield, model clauses in your contracts, or binding corporate rules.' ) . '
'; + } + + $strings[] = '' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '
'; + + $strings[] = '' . __( 'Your contact information' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'In this section you should provide a contact method for privacy-specific concerns. If you are required to have a Data Protection Officer, list their name and full contact details here as well.' ) . '
'; + } + + $strings[] = '' . __( 'Additional information' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'If you use your site for commercial purposes and you engage in more complex collection or processing of personal data, you should note the following information in your privacy policy in addition to the information we have already discussed.' ) . '
'; + } + + $strings[] = '' . __( 'How we protect your data' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'In this section you should explain what measures you have taken to protect your users’ data. This could include technical measures such as encryption; security measures such as two factor authentication; and measures such as staff training in data protection. If you have carried out a Privacy Impact Assessment, you can mention it here too.' ) . '
'; + } + + $strings[] = '' . __( 'What data breach procedures we have in place' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'In this section you should explain what procedures you have in place to deal with data breaches, either potential or real, such as internal reporting systems, contact mechanisms, or bug bounties.' ) . '
'; + } + + $strings[] = '' . __( 'What third parties we receive data from' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'If your web site receives data about users from third parties, including advertisers, this information must be included within the section of your privacy policy dealing with third party data.' ) . '
'; + } + + $strings[] = '' . __( 'What automated decision making and/or profiling we do with user data' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'If your web site provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '
'; + } + + $strings[] = '' . __( 'Industry regulatory disclosure requirements' ) . '
'; + + if ( $description ) { + $strings[] = '' . __( 'If you are a member of a regulated industry, or if you are subject to additional privacy laws, you may be required to disclose that information here.' ) . '
'; + $strings[] = '' ) ) { + $strings[ $key ] = '' . $string . ''; + } + + if ( 0 === strpos( $string, '
' ) ) {
+ $strings[ $key ] = '' . $string . '';
+ }
+
+ if ( 0 === strpos( $string, '' ) ) {
+ $strings[ $key ] = '' . $string . '';
+ }
+ }
+ }
+
+ $content = implode( '', $strings );
+ // End of the suggested privacy policy text.
+
+ /**
+ * Filters the default content suggested for inclusion in a privacy policy.
+ *
+ * @since 4.9.6
+ * @since 5.0.0 Added the `$strings`, `$description`, and `$blocks` parameters.
+ *
+ * @param $content string The default policy content.
+ * @param $strings array An array of privacy policy content strings.
+ * @param $description bool Whether policy descriptions should be included.
+ * @param $blocks bool Whether the content should be formatted for the block editor.
+ */
+ return apply_filters( 'wp_get_default_privacy_policy_content', $content, $strings, $description, $blocks );
+ }
+
+ /**
+ * Add the suggested privacy policy text to the policy postbox.
+ *
+ * @since 4.9.6
+ */
+ public static function add_suggested_content() {
+ $content = self::get_default_content( true, false );
+ wp_add_privacy_policy_content( __( 'WordPress' ), $content );
+ }
+}
diff --git a/src/wp-admin/includes/options.php b/src/wp-admin/includes/options.php
index 053d5eec6425a..f011efd312369 100644
--- a/src/wp-admin/includes/options.php
+++ b/src/wp-admin/includes/options.php
@@ -51,7 +51,7 @@ function options_general_add_js() {
$("input[name='date_format']").click(function(){
if ( "date_format_custom_radio" != $(this).attr("id") )
- $( "input[name='date_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
+ $( 'input[name="date_format_custom"]' ).val( $( this ).val() ).closest( 'fieldset' ).find( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
});
$( 'input[name="date_format_custom"]' ).on( 'click input', function() {
$( '#date_format_custom_radio' ).prop( 'checked', true );
@@ -59,18 +59,23 @@ function options_general_add_js() {
$("input[name='time_format']").click(function(){
if ( "time_format_custom_radio" != $(this).attr("id") )
- $( "input[name='time_format_custom']" ).val( $( this ).val() ).siblings( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
+ $( 'input[name="time_format_custom"]' ).val( $( this ).val() ).closest( 'fieldset' ).find( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
});
$( 'input[name="time_format_custom"]' ).on( 'click input', function() {
$( '#time_format_custom_radio' ).prop( 'checked', true );
});
$("input[name='date_format_custom'], input[name='time_format_custom']").change( function() {
- var format = $(this);
- format.siblings( '.spinner' ).addClass( 'is-active' );
- $.post(ajaxurl, {
- action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
+ var format = $( this ),
+ fieldset = format.closest( 'fieldset' ),
+ example = fieldset.find( '.example' ),
+ spinner = fieldset.find( '.spinner' );
+
+ spinner.addClass( 'is-active' );
+
+ $.post( ajaxurl, {
+ action: 'date_format_custom' == format.attr( 'name' ) ? 'date_format' : 'time_format',
date : format.val()
- }, function(d) { format.siblings( '.spinner' ).removeClass( 'is-active' ); format.siblings('.example').text(d); } );
+ }, function( d ) { spinner.removeClass( 'is-active' ); example.text( d ); } );
});
var languageSelect = $( '#WPLANG' );
diff --git a/src/wp-admin/includes/plugin-install.php b/src/wp-admin/includes/plugin-install.php
index 1714acda71f4f..eea74f1aeb072 100644
--- a/src/wp-admin/includes/plugin-install.php
+++ b/src/wp-admin/includes/plugin-install.php
@@ -584,12 +584,20 @@ function install_plugin_information() {
-
diff --git a/src/wp-admin/includes/plugin.php b/src/wp-admin/includes/plugin.php
index 1236723f8d94a..2dd58b3354643 100644
--- a/src/wp-admin/includes/plugin.php
+++ b/src/wp-admin/includes/plugin.php
@@ -194,17 +194,6 @@ function get_plugin_files( $plugin ) {
$plugin_file = WP_PLUGIN_DIR . '/' . $plugin;
$dir = dirname( $plugin_file );
- $data = get_plugin_data( $plugin_file );
- $label = isset( $data['Version'] )
- ? sanitize_key( 'files_' . $plugin . '-' . $data['Version'] )
- : sanitize_key( 'files_' . $plugin );
- $transient_key = substr( $label, 0, 29 ) . md5( $label );
-
- $plugin_files = get_transient( $transient_key );
- if ( false !== $plugin_files ) {
- return $plugin_files;
- }
-
$plugin_files = array( plugin_basename( $plugin_file ) );
if ( is_dir( $dir ) && WP_PLUGIN_DIR !== $dir ) {
@@ -225,8 +214,6 @@ function get_plugin_files( $plugin ) {
$plugin_files = array_values( array_unique( $plugin_files ) );
}
- set_transient( $transient_key, $plugin_files, HOUR_IN_SECONDS );
-
return $plugin_files;
}
@@ -443,13 +430,17 @@ function _get_dropins() {
}
/**
- * Check whether a plugin is active.
+ * Determines whether a plugin is active.
*
* Only plugins installed in the plugins/ folder can be active.
*
* Plugins in the mu-plugins/ folder can't be "activated," so this function will
* return false for those plugins.
- *
+ *
+ * For more information on this and similar theme functions, check out
+ * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
+ * Conditional Tags} article in the Theme Developer Handbook.
+ *
* @since 2.5.0
*
* @param string $plugin Path to the main plugin file from plugins directory.
@@ -460,10 +451,14 @@ function is_plugin_active( $plugin ) {
}
/**
- * Check whether the plugin is inactive.
+ * Determines whether the plugin is inactive.
*
* Reverse of is_plugin_active(). Used as a callback.
- *
+ *
+ * For more information on this and similar theme functions, check out
+ * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
+ * Conditional Tags} article in the Theme Developer Handbook.
+ *
* @since 3.1.0
* @see is_plugin_active()
*
@@ -475,17 +470,21 @@ function is_plugin_inactive( $plugin ) {
}
/**
- * Check whether the plugin is active for the entire network.
+ * Determines whether the plugin is active for the entire network.
*
* Only plugins installed in the plugins/ folder can be active.
*
* Plugins in the mu-plugins/ folder can't be "activated," so this function will
* return false for those plugins.
- *
+ *
+ * For more information on this and similar theme functions, check out
+ * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
+ * Conditional Tags} article in the Theme Developer Handbook.
+ *
* @since 3.0.0
*
* @param string $plugin Path to the main plugin file from plugins directory.
- * @return bool True, if active for the network, otherwise false.
+ * @return bool True if active for the network, otherwise false.
*/
function is_plugin_active_for_network( $plugin ) {
if ( !is_multisite() )
@@ -1909,3 +1908,55 @@ function plugin_sandbox_scrape( $plugin ) {
wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
include( WP_PLUGIN_DIR . '/' . $plugin );
}
+
+/**
+ * Helper function for adding content to the Privacy Policy Guide.
+ *
+ * Plugins and themes should suggest text for inclusion in the site's privacy policy.
+ * The suggested text should contain information about any functionality that affects user privacy,
+ * and will be shown on the Privacy Policy Guide screen.
+ *
+ * A plugin or theme can use this function multiple times as long as it will help to better present
+ * the suggested policy content. For example modular plugins such as WooCommerse or Jetpack
+ * can add or remove suggested content depending on the modules/extensions that are enabled.
+ * For more information see the Plugin Handbook:
+ * https://developer.wordpress.org/plugins/privacy/suggesting-text-for-the-site-privacy-policy/.
+ *
+ * Intended for use with the `'admin_init'` action.
+ *
+ * @since 4.9.6
+ *
+ * @param string $plugin_name The name of the plugin or theme that is suggesting content for the site's privacy policy.
+ * @param string $policy_text The suggested content for inclusion in the policy.
+ */
+function wp_add_privacy_policy_content( $plugin_name, $policy_text ) {
+ if ( ! is_admin() ) {
+ _doing_it_wrong(
+ __FUNCTION__,
+ sprintf(
+ /* translators: %s: admin_init */
+ __( 'The suggested privacy policy content should be added only in wp-admin by using the %s (or later) action.' ),
+ '
';
}
@@ -1018,7 +1028,7 @@ function do_meta_boxes( $screen, $context, $object ) {
$hidden = get_hidden_meta_boxes( $screen );
- printf('admin_init'
+ ),
+ '4.9.7'
+ );
+ return;
+ } elseif ( ! doing_action( 'admin_init' ) && ! did_action( 'admin_init' ) ) {
+ _doing_it_wrong(
+ __FUNCTION__,
+ sprintf(
+ /* translators: %s: admin_init */
+ __( 'The suggested privacy policy content should be added by using the %s (or later) action. Please see the inline documentation.' ),
+ 'admin_init'
+ ),
+ '4.9.7'
+ );
+ return;
+ }
+
+ if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
+ require_once( ABSPATH . 'wp-admin/includes/misc.php' );
+ }
+
+ WP_Privacy_Policy_Content::add( $plugin_name, $policy_text );
+}
diff --git a/src/wp-admin/includes/post.php b/src/wp-admin/includes/post.php
index 908b80c333085..a95ff78bc6967 100644
--- a/src/wp-admin/includes/post.php
+++ b/src/wp-admin/includes/post.php
@@ -814,7 +814,7 @@ function add_meta( $post_ID ) {
if ( is_string( $metavalue ) )
$metavalue = trim( $metavalue );
- if ( ('0' === $metavalue || ! empty ( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput ) ) ) {
+ if ( ( ( '#NONE#' != $metakeyselect ) && ! empty( $metakeyselect ) ) || ! empty( $metakeyinput ) ) {
/*
* We have a key/value pair. If both the select and the input
* for the key have data, the input takes precedence.
@@ -1147,6 +1147,10 @@ function wp_edit_attachments_query_vars( $q = false ) {
$q['post_parent'] = 0;
}
+ if ( isset( $q['mine'] ) || ( isset( $q['attachment-filter'] ) && 'mine' == $q['attachment-filter'] ) ) {
+ $q['author'] = get_current_user_id();
+ }
+
// Filter query clauses to include filenames.
if ( isset( $q['s'] ) ) {
add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
@@ -1870,3 +1874,289 @@ function redirect_post($post_id = '') {
wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
exit;
}
+
+/**
+ * Return whether the post can be edited in the block editor.
+ *
+ * @since 5.0.0
+ *
+ * @param int|WP_Post $post Post ID or WP_Post object.
+ * @return bool Whether the post can be edited in the block editor.
+ */
+function use_block_editor_for_post( $post ) {
+ $post = get_post( $post );
+
+ if ( ! $post ) {
+ return false;
+ }
+
+ // We're in the meta box loader, so don't use the block editor.
+ if ( isset( $_GET['meta-box-loader'] ) ) {
+ check_admin_referer( 'meta-box-loader' );
+ return false;
+ }
+
+ $use_block_editor = use_block_editor_for_post_type( $post->post_type );
+
+ /**
+ * Filter whether a post is able to be edited in the block editor.
+ *
+ * @since 5.0.0
+ *
+ * @param bool $use_block_editor Whether the post can be edited or not.
+ * @param WP_Post $post The post being checked.
+ */
+ return apply_filters( 'use_block_editor_for_post', $use_block_editor, $post );
+}
+
+/**
+ * Return whether a post type is compatible with the block editor.
+ *
+ * The block editor depends on the REST API, and if the post type is not shown in the
+ * REST API, then it won't work with the block editor.
+ *
+ * @since 5.0.0
+ *
+ * @param string $post_type The post type.
+ * @return bool Whether the post type can be edited with the block editor.
+ */
+function use_block_editor_for_post_type( $post_type ) {
+ if ( ! post_type_exists( $post_type ) ) {
+ return false;
+ }
+
+ if ( ! post_type_supports( $post_type, 'editor' ) ) {
+ return false;
+ }
+
+ $post_type_object = get_post_type_object( $post_type );
+ if ( $post_type_object && ! $post_type_object->show_in_rest ) {
+ return false;
+ }
+
+ /**
+ * Filter whether a post is able to be edited in the block editor.
+ *
+ * @since 5.0.0
+ *
+ * @param bool $use_block_editor Whether the post type can be edited or not. Default true.
+ * @param string $post_type The post type being checked.
+ */
+ return apply_filters( 'use_block_editor_for_post_type', true, $post_type );
+}
+
+/**
+ * Returns all the block categories that will be shown in the block editor.
+ *
+ * @since 5.0.0
+ *
+ * @param WP_Post $post Post object.
+ * @return array Array of block categories.
+ */
+function get_block_categories( $post ) {
+ $default_categories = array(
+ array(
+ 'slug' => 'common',
+ 'title' => __( 'Common Blocks' ),
+ ),
+ array(
+ 'slug' => 'formatting',
+ 'title' => __( 'Formatting' ),
+ ),
+ array(
+ 'slug' => 'layout',
+ 'title' => __( 'Layout Elements' ),
+ ),
+ array(
+ 'slug' => 'widgets',
+ 'title' => __( 'Widgets' ),
+ ),
+ array(
+ 'slug' => 'embed',
+ 'title' => __( 'Embeds' ),
+ ),
+ array(
+ 'slug' => 'reusable',
+ 'title' => __( 'Reusable Blocks' ),
+ ),
+ );
+
+ /**
+ * Filter the default array of block categories.
+ *
+ * @since 5.0.0
+ *
+ * @param array $default_categories Array of block categories.
+ * @param WP_Post $post Post being loaded.
+ */
+ return apply_filters( 'block_categories', $default_categories, $post );
+}
+
+/**
+ * Prepares server-registered blocks for the block editor.
+ *
+ * Returns an associative array of registered block data keyed by block name. Data includes properties
+ * of a block relevant for client registration.
+ *
+ * @since 5.0.0
+ *
+ * @return array An associative array of registered block data.
+ */
+function get_block_editor_server_block_settings() {
+ $block_registry = WP_Block_Type_Registry::get_instance();
+ $blocks = array();
+ $keys_to_pick = array( 'title', 'description', 'icon', 'category', 'keywords', 'supports', 'attributes' );
+
+ foreach ( $block_registry->get_all_registered() as $block_name => $block_type ) {
+ foreach ( $keys_to_pick as $key ) {
+ if ( ! isset( $block_type->{ $key } ) ) {
+ continue;
+ }
+
+ if ( ! isset( $blocks[ $block_name ] ) ) {
+ $blocks[ $block_name ] = array();
+ }
+
+ $blocks[ $block_name ][ $key ] = $block_type->{ $key };
+ }
+ }
+
+ return $blocks;
+}
+
+/**
+ * Renders the meta boxes forms.
+ *
+ * @since 5.0.0
+ */
+function the_block_editor_meta_boxes() {
+ global $post, $current_screen, $wp_meta_boxes;
+
+ // Handle meta box state.
+ $_original_meta_boxes = $wp_meta_boxes;
+
+ /**
+ * Fires right before the meta boxes are rendered.
+ *
+ * This allows for the filtering of meta box data, that should already be
+ * present by this point. Do not use as a means of adding meta box data.
+ *
+ * @since 5.0.0
+ *
+ * @param array $wp_meta_boxes Global meta box state.
+ */
+ $wp_meta_boxes = apply_filters( 'filter_block_editor_meta_boxes', $wp_meta_boxes );
+ $locations = array( 'side', 'normal', 'advanced' );
+ $priorities = array( 'high', 'sorted', 'core', 'default', 'low' );
+
+ // Render meta boxes.
+ ?>
+
+
+
+
+ id ][ $location ] ) ) {
+ continue;
+ }
+
+ foreach ( $priorities as $priority ) {
+ if ( ! isset( $wp_meta_boxes[ $current_screen->id ][ $location ][ $priority ] ) ) {
+ continue;
+ }
+
+ $meta_boxes = (array) $wp_meta_boxes[ $current_screen->id ][ $location ][ $priority ];
+ foreach ( $meta_boxes as $meta_box ) {
+ if ( false == $meta_box || ! $meta_box['title'] ) {
+ continue;
+ }
+
+ $meta_boxes_per_location[ $location ][] = array(
+ 'id' => $meta_box['id'],
+ 'title' => $meta_box['title'],
+ );
+ }
+ }
+ }
+
+ /**
+ * Sadly we probably can not add this data directly into editor settings.
+ *
+ * Some meta boxes need admin_head to fire for meta box registry.
+ * admin_head fires after admin_enqueue_scripts, which is where we create our
+ * editor instance.
+ */
+ $script = 'window._wpLoadBlockEditor.then( function() {
+ wp.data.dispatch( \'core/edit-post\' ).setAvailableMetaBoxesPerLocation( ' . wp_json_encode( $meta_boxes_per_location ) . ' );
+ } );';
+
+ wp_add_inline_script( 'wp-edit-post', $script );
+
+ /**
+ * When `wp-edit-post` is output in the ``, the inline script needs to be manually printed. Otherwise,
+ * meta boxes will not display because inline scripts for `wp-edit-post` will not be printed again after this point.
+ */
+ if ( wp_script_is( 'wp-edit-post', 'done' ) ) {
+ printf( "\n", trim( $script ) );
+ }
+
+ // Reset meta box data.
+ $wp_meta_boxes = $_original_meta_boxes;
+}
+
+/**
+ * Renders the hidden form required for the meta boxes form.
+ *
+ * @since 5.0.0
+ *
+ * @param WP_Post $post Current post object.
+ */
+function the_block_editor_meta_box_post_form_hidden_fields( $post ) {
+ $form_extra = '';
+ if ( 'auto-draft' === $post->post_status ) {
+ $form_extra .= "";
+ }
+ $form_action = 'editpost';
+ $nonce_action = 'update-post_' . $post->ID;
+ $form_extra .= "";
+ $referer = wp_get_referer();
+ $current_user = wp_get_current_user();
+ $user_id = $current_user->ID;
+ wp_nonce_field( $nonce_action );
+ ?>
+
+
+
+
+
+
+
+ 768,
'medium_large_size_h' => 0,
+
+ // 4.9.6
+ 'wp_page_for_privacy_policy' => 0,
+
+ // 4.9.8
+ 'show_comments_cookies_opt_in' => 0,
);
// 3.3
diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
index ec0fb525911f9..e51903e442da3 100644
--- a/src/wp-admin/includes/template.php
+++ b/src/wp-admin/includes/template.php
@@ -337,6 +337,16 @@ function get_inline_data($post) {
if ( post_type_supports( $post->post_type, 'post-formats' ) )
echo '' . esc_html( get_post_format( $post->ID ) ) . '
';
+ /**
+ * Fires after outputting the fields for the inline editor for posts and pages.
+ *
+ * @since 4.9.8
+ *
+ * @param WP_Post $post The current post object.
+ * @param WP_Post_Type $post_type_object The current post's post type object.
+ */
+ do_action( 'add_inline_data', $post, $post_type_object );
+
echo '' . __( 'Cheatin’ uh?' ) . '
' . + '' . __( 'Something went wrong.' ) . '
' . '' . __( 'One of the selected users is not a member of this site.' ) . '
', 403 ); diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php index 5f57819d4f1d2..be8034f405699 100644 --- a/src/wp-admin/options-discussion.php +++ b/src/wp-admin/options-discussion.php @@ -77,6 +77,13 @@ ); ?>+ + +
+