Changeset 61547

Timestamp:

01/28/2026 09:01:01 PM (2 months ago)

Author:

jorbin

Message:

General: Revert commit with accidental changes.

[61531] included both the intended change of [61480] and additional code. In order to provide as clean of a history as possible, this is being reverted and will be recommitted so that it only contains the correct code.

Unprops jorbin.

Follow up to [61531].

See #64350.
Props joedolson, westonruter, jonsurrell, desrosj.

Location:

branches/6.9

Files:

• . (modified) (1 prop)
• src/js/_enqueues/vendor/thickbox/thickbox.css (modified) (1 diff)
• src/wp-admin/css/admin-menu.css (modified) (1 diff)
• src/wp-admin/css/colors/_admin.scss (modified) (1 diff)
• src/wp-admin/css/common.css (modified) (18 diffs)
• src/wp-admin/css/customize-controls.css (modified) (14 diffs)
• src/wp-admin/css/customize-nav-menus.css (modified) (7 diffs)
• src/wp-admin/css/customize-widgets.css (modified) (7 diffs)
• src/wp-admin/css/dashboard.css (modified) (15 diffs)
• src/wp-admin/css/edit.css (modified) (5 diffs)
• src/wp-admin/css/forms.css (modified) (4 diffs)
• src/wp-admin/css/list-tables.css (modified) (11 diffs)
• src/wp-admin/css/media.css (modified) (4 diffs)
• src/wp-admin/css/revisions.css (modified) (2 diffs)
• src/wp-admin/css/site-health.css (modified) (4 diffs)
• src/wp-admin/css/themes.css (modified) (9 diffs)
• src/wp-admin/css/widgets.css (modified) (1 diff)
• src/wp-includes/css/admin-bar.css (modified) (14 diffs)
• src/wp-includes/css/editor.css (modified) (7 diffs)
• src/wp-includes/css/jquery-ui-dialog.css (modified) (1 diff)
• src/wp-includes/css/media-views.css (modified) (5 diffs)
• src/wp-includes/css/wp-auth-check.css (modified) (1 diff)
• src/wp-includes/css/wp-pointer.css (modified) (2 diffs)
• src/wp-includes/pluggable.php (modified) (1 diff)
• tests/phpunit/tests/pluggable/wpMail.php (modified) (1 diff)

branches/6.9/src/js/_enqueues/vendor/thickbox/thickbox.css

@@ -135 +135 @@
 
 .tb-close-icon:before {
-    content: "\f158";
     content: "\f158" / '';
     font: normal 20px/29px dashicons;

branches/6.9/src/wp-admin/css/admin-menu.css

@@ -504 +504 @@
 
 #collapse-button .collapse-button-icon:after {
-    content: "\f148";
     content: "\f148" / '';
     display: block;

branches/6.9/src/wp-admin/css/colors/_admin.scss

@@ -69 +69 @@
 
 input[type=checkbox]:checked::before {
-    content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27#{url-friendly-colour(variables.$form-checked)}%27%2F%3E%3C%2Fsvg%3E");
     content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27#{url-friendly-colour(variables.$form-checked)}%27%2F%3E%3C%2Fsvg%3E") / '';
 }

branches/6.9/src/wp-admin/css/common.css

@@ -560 +560 @@
 
 .js-update-details-toggle[aria-expanded="true"] .dashicons::before {
-    content: "\f142";
     content: "\f142" / '';
 }
@@ -807 +806 @@
     background: none;
     color: #787c82;
-    content: "\f153";
     content: "\f153" / '';
     display: block;
@@ -1135 +1133 @@
 
 .wp-filter .drawer-toggle:before {
-    content: "\f111";
     content: "\f111" / '';
     margin: 0 5px 0 0;
@@ -1528 +1525 @@
 #plugin-information-footer .update-now:not(.button-disabled):before {
     color: #d63638;
-    content: "\f463";
     content: "\f463" / '';
     display: inline-block;
@@ -1591 +1587 @@
 .button.activating-message:before {
     color: #d63638;
-    content: "\f463";
     content: "\f463" / '';
 }
@@ -1628 +1623 @@
 .button.activated-message:before {
     color: #68de7c;
-    content: "\f147";
     content: "\f147" / '';
 }
@@ -1635 +1629 @@
 .update-message.notice-error p:before {
     color: #d63638;
-    content: "\f534";
     content: "\f534" / '';
 }
@@ -1845 +1838 @@
 #screen-meta-links .show-settings:after {
     right: 0;
-    content: "\f140";
     content: "\f140" / '';
     font: normal 20px/1 dashicons;
@@ -1859 +1851 @@
 
 #screen-meta-links .screen-meta-active:after {
-    content: "\f142";
     content: "\f142" / '';
 }
@@ -2681 +2672 @@
 
 .star-rating .star-full:before {
-    content: "\f155";
     content: "\f155" / '';
 }
 
 .star-rating .star-half:before {
-    content: "\f459";
     content: "\f459" / '';
 }
@@ -2695 +2684 @@
 
 .star-rating .star-empty:before {
-    content: "\f154";
     content: "\f154" / '';
 }
@@ -3187 +3175 @@
 
 .plugin-details-modal #TB_closeWindowButton:after {
-    content: "\f335";
     content: "\f335" / '';
     font: normal 32px/29px 'dashicons';
@@ -3214 +3201 @@
 .bulk-action-notice .toggle-indicator::before,
 .privacy-text-box .toggle-indicator::before {
-    content: "\f142";
     content: "\f142" / '';
     display: inline-block;
@@ -3227 +3213 @@
 .bulk-action-notice .bulk-action-errors-collapsed .toggle-indicator::before,
 .privacy-text-box.closed .toggle-indicator::before {
-    content: "\f140";
     content: "\f140" / '';
 }
 
 .postbox .handle-order-higher .order-higher-indicator::before {
-    content: "\f343";
     content: "\f343" / '';
     color: inherit;
@@ -3238 +3222 @@
 
 .postbox .handle-order-lower .order-lower-indicator::before {
-    content: "\f347";
     content: "\f347" / '';
     color: inherit;
@@ -3362 +3345 @@
 }
 [role="treeitem"][aria-expanded="false"] > .folder-label .icon:after {
-    content: "\f139";
     content: "\f139" / '';
 }
 [role="treeitem"][aria-expanded="true"] > .folder-label .icon:after {
-    content: "\f140";
     content: "\f140" / '';
 }
@@ -3582 +3563 @@
 .wp-customizer .accordion-section-title:after,
 .widget-top .widget-action .toggle-indicator:before {
-    content: "\f140";
     content: "\f140" / '';
     font: normal 20px/1 dashicons;
@@ -3631 +3611 @@
 .widget.open .widget-top .widget-action .toggle-indicator:before,
 .widget.widget-in-question .widget-top .widget-action .toggle-indicator:before {
-    content: "\f142";
     content: "\f142" / '';
 }

branches/6.9/src/wp-admin/css/customize-controls.css

@@ -234 +234 @@
 }
 #customize-control-trash_changeset .button-link:before {
-    content: "\f182";
     content: "\f182" / '';
     font: normal 22px dashicons;
@@ -596 +595 @@
 #customize-theme-controls .accordion-section-title:after,
 #customize-outer-theme-controls .accordion-section-title:after {
-    content: "\f345";
     content: "\f345" / '';
     color: #a7aaad;
@@ -934 +932 @@
 .customize-controls-close:before {
     font: normal 22px/45px dashicons;
-    content: "\f335";
     content: "\f335" / '';
     position: relative;
@@ -944 +941 @@
 .customize-section-back:before {
     font: normal 20px/72px dashicons;
-    content: "\f341";
     content: "\f341" / '';
     position: relative;
@@ -1031 +1027 @@
 .customize-section-description a.external-link:after {
     font: 16px/11px dashicons;
-    content: "\f504";
     content: "\f504" / '';
     top: 3px;
@@ -1363 +1358 @@
 
 .customize-control .dropdown-arrow:after {
-    content: "\f140";
     content: "\f140" / '';
     font: normal 20px/1 dashicons;
@@ -1888 +1882 @@
 
 .themes-filter-bar .feature-filter-toggle:before {
-    content: "\f111";
     content: "\f111" / '';
     margin: 0 5px 0 0;
@@ -2027 +2020 @@
 
 .control-panel-themes .theme-section .customize-themes-section-title.selected:after {
-    content: "\f147";
     content: "\f147" / '';
     font: 16px/1 dashicons;
@@ -2531 +2523 @@
 .add-new-menu-item:before,
 #available-menu-items .new-content-item .add-content:before {
-    content: "\f132";
     content: "\f132" / '';
     display: inline-block;
@@ -2611 +2602 @@
 .move-widget-down:before,
 .menus-move-down:before {
-    content: "\f347";
     content: "\f347" / '';
 }
@@ -2617 +2607 @@
 .move-widget-up:before,
 .menus-move-up:before {
-    content: "\f343";
     content: "\f343" / '';
 }
@@ -2778 +2767 @@
 #available-widgets-filter .clear-results:before,
 #available-menu-items-search .clear-results:before {
-    content: "\f335";
     content: "\f335" / '';
     font: normal 20px/1 dashicons;
@@ -2990 +2978 @@
     .customize-controls-preview-toggle .controls:before {
         font: normal 20px/1 dashicons;
-        content: "\f177";
         content: "\f177" / '';
         position: relative;
@@ -2998 +2985 @@
 
     .customize-controls-preview-toggle .controls:before {
-        content: "\f540";
         content: "\f540" / '';
     }

branches/6.9/src/wp-admin/css/customize-nav-menus.css

@@ -142 +142 @@
 
 .menus-move-left:before {
-    content: "\f341";
     content: "\f341" / '';
 }
 
 .menus-move-right:before {
-    content: "\f345";
     content: "\f345" / '';
 }
@@ -180 +178 @@
 
 .wp-customizer .menu-item.menu-item-edit-active .item-edit .toggle-indicator:before {
-    content: "\f142";
     content: "\f142" / '';
 }
@@ -281 +278 @@
     -moz-osx-font-smoothing: grayscale;
     border: none;
-    content: "\f111";
     content: "\f111" / '';
     display: block;
@@ -325 +321 @@
 .wp-customizer .menu-item .item-edit .toggle-indicator:before,
 #available-menu-items .accordion-section-title .toggle-indicator:before {
-    content: "\f140";
     content: "\f140" / '';
     display: block;
@@ -472 +467 @@
 
 .menu-item-bar .item-delete:before {
-    content: "\f335";
     content: "\f335" / '';
     position: absolute;
@@ -658 +652 @@
 
 #available-menu-items .item-add:before {
-    content: "\f543";
     content: "\f543" / '';
     position: relative;
@@ -677 +670 @@
 
 #available-menu-items .menu-item-handle.item-added .item-add:before {
-    content: "\f147";
     content: "\f147" / '';
 }

branches/6.9/src/wp-admin/css/customize-widgets.css

@@ -131 +131 @@
 
 .move-widget:before {
-    content: "\f504";
     content: "\f504" / '';
 }
@@ -172 +171 @@
 #customize-theme-controls .widget-area-select li:before {
     display: none;
-    content: "\f147";
     content: "\f147" / '';
     position: absolute;
@@ -295 +293 @@
 
 #available-widgets .widget-title:before {
-    content: "\f132";
     content: "\f132" / '';
     position: absolute;
@@ -312 +309 @@
 
 /* dashicons-smiley */
-#available-widgets [class*="easy"] .widget-title:before {
-    content: "\f328";
-    content: "\f328" / '';
-    top: -4px;
-}
+#available-widgets [class*="easy"] .widget-title:before { content: "\f328" / ''; top: -4px; }
 
 /* dashicons-star-filled */
 #available-widgets [class*="super"] .widget-title:before,
-#available-widgets [class*="like"] .widget-title:before {
-    content: "\f155";
-    content: "\f155" / '';
-    top: -4px;
-}
+#available-widgets [class*="like"] .widget-title:before { content: "\f155" / ''; top: -4px; }
 
 /* dashicons-wordpress */
-#available-widgets [class*="meta"] .widget-title:before {
-    content: "\f120";
-    content: "\f120" / '';
-}
+#available-widgets [class*="meta"] .widget-title:before { content: "\f120" / ''; }
 
 /* dashicons-archive */
-#available-widgets [class*="archives"] .widget-title:before {
-    content: "\f480";
-    content: "\f480" / '';
-    top: -4px;
-}
+#available-widgets [class*="archives"] .widget-title:before { content: "\f480" / ''; top: -4px; }
 
 /* dashicons-category */
-#available-widgets [class*="categor"] .widget-title:before {
-    content: "\f318";
-    content: "\f318" / '';
-    top: -4px;
-}
+#available-widgets [class*="categor"] .widget-title:before { content: "\f318" / ''; top: -4px; }
 
 /* dashicons-admin-comments */
 #available-widgets [class*="comment"] .widget-title:before,
 #available-widgets [class*="testimonial"] .widget-title:before,
-#available-widgets [class*="chat"] .widget-title:before {
-    content: "\f101";
-    content: "\f101" / '';
-}
+#available-widgets [class*="chat"] .widget-title:before { content: "\f101" / ''; }
 
 /* dashicons-admin-post */
-#available-widgets [class*="post"] .widget-title:before {
-    content: "\f109";
-    content: "\f109" / '';
-}
+#available-widgets [class*="post"] .widget-title:before { content: "\f109" / ''; }
 
 /* dashicons-admin-page */
-#available-widgets [class*="page"] .widget-title:before {
-    content: "\f105";
-    content: "\f105" / '';
-}
+#available-widgets [class*="page"] .widget-title:before { content: "\f105" / ''; }
 
 /* dashicons-text */
-#available-widgets [class*="text"] .widget-title:before {
-    content: "\f478";
-    content: "\f478" / '';
-}
+#available-widgets [class*="text"] .widget-title:before { content: "\f478" / ''; }
 
 /* dashicons-admin-links */
-#available-widgets [class*="link"] .widget-title:before {
-    content: "\f103";
-    content: "\f103" / '';
-}
+#available-widgets [class*="link"] .widget-title:before { content: "\f103" / ''; }
 
 /* dashicons-search */
-#available-widgets [class*="search"] .widget-title:before {
-    content: "\f179";
-    content: "\f179" / '';
-}
+#available-widgets [class*="search"] .widget-title:before { content: "\f179" / ''; }
 
 /* dashicons-menu */
 #available-widgets [class*="menu"] .widget-title:before,
-#available-widgets [class*="nav"] .widget-title:before {
-    content: "\f333";
-    content: "\f333" / '';
-}
+#available-widgets [class*="nav"] .widget-title:before { content: "\f333" / ''; }
 
 /* dashicons-tagcloud */
-#available-widgets [class*="tag"] .widget-title:before {
-    content: "\f479";
-    content: "\f479" / '';
-}
+#available-widgets [class*="tag"] .widget-title:before { content: "\f479" / ''; }
 
 /* dashicons-rss */
-#available-widgets [class*="rss"] .widget-title:before {
-    content: "\f303";
-    content: "\f303" / '';
-    top: -6px;
-}
+#available-widgets [class*="rss"] .widget-title:before { content: "\f303" / ''; top: -6px; }
 
 /* dashicons-calendar */
 #available-widgets [class*="event"] .widget-title:before,
-#available-widgets [class*="calendar"] .widget-title:before {
-    content: "\f145";
-    content: "\f145" / '';
-    top: -4px;
-}
+#available-widgets [class*="calendar"] .widget-title:before { content: "\f145" / ''; top: -4px;}
 
 /* dashicons-format-image */
@@ -416 +362 @@
 #available-widgets [class*="photo"] .widget-title:before,
 #available-widgets [class*="slide"] .widget-title:before,
-#available-widgets [class*="instagram"] .widget-title:before {
-    content: "\f128";
-    content: "\f128" / '';
-}
+#available-widgets [class*="instagram"] .widget-title:before { content: "\f128" / ''; }
 
 /* dashicons-format-gallery */
 #available-widgets [class*="album"] .widget-title:before,
-#available-widgets [class*="galler"] .widget-title:before {
-    content: "\f161";
-    content: "\f161" / '';
-}
+#available-widgets [class*="galler"] .widget-title:before { content: "\f161" / ''; }
 
 /* dashicons-format-video */
 #available-widgets [class*="video"] .widget-title:before,
-#available-widgets [class*="tube"] .widget-title:before {
-    content: "\f126";
-    content: "\f126" / '';
-}
+#available-widgets [class*="tube"] .widget-title:before { content: "\f126" / ''; }
 
 /* dashicons-format-audio */
 #available-widgets [class*="music"] .widget-title:before,
 #available-widgets [class*="radio"] .widget-title:before,
-#available-widgets [class*="audio"] .widget-title:before {
-    content: "\f127";
-    content: "\f127" / '';
-}
+#available-widgets [class*="audio"] .widget-title:before { content: "\f127" / ''; }
 
 /* dashicons-admin-users */
@@ -450 +384 @@
 #available-widgets [class*="subscriber"] .widget-title:before,
 #available-widgets [class*="profile"] .widget-title:before,
-#available-widgets [class*="grofile"] .widget-title:before {
-    content: "\f110";
-    content: "\f110" / '';
-}
+#available-widgets [class*="grofile"] .widget-title:before { content: "\f110" / ''; }
 
 /* dashicons-cart */
 #available-widgets [class*="commerce"] .widget-title:before,
 #available-widgets [class*="shop"] .widget-title:before,
-#available-widgets [class*="cart"] .widget-title:before {
-    content: "\f174";
-    content: "\f174" / '';
-    top: -4px;
-}
+#available-widgets [class*="cart"] .widget-title:before { content: "\f174" / ''; top: -4px; }
 
 /* dashicons-shield */
 #available-widgets [class*="secur"] .widget-title:before,
-#available-widgets [class*="firewall"] .widget-title:before {
-    content: "\f332";
-    content: "\f332" / '';
-}
+#available-widgets [class*="firewall"] .widget-title:before { content: "\f332" / ''; }
 
 /* dashicons-chart-bar */
 #available-widgets [class*="analytic"] .widget-title:before,
 #available-widgets [class*="stat"] .widget-title:before,
-#available-widgets [class*="poll"] .widget-title:before {
-    content: "\f185";
-    content: "\f185" / '';
-}
+#available-widgets [class*="poll"] .widget-title:before { content: "\f185" / ''; }
 
 /* dashicons-feedback */
-#available-widgets [class*="form"] .widget-title:before {
-    content: "\f175";
-    content: "\f175" / '';
-}
+#available-widgets [class*="form"] .widget-title:before { content: "\f175" / ''; }
 
 /* dashicons-email-alt */
@@ -489 +407 @@
 #available-widgets [class*="news"] .widget-title:before,
 #available-widgets [class*="contact"] .widget-title:before,
-#available-widgets [class*="mail"] .widget-title:before {
-    content: "\f466";
-    content: "\f466" / '';
-}
+#available-widgets [class*="mail"] .widget-title:before { content: "\f466" / ''; }
 
 /* dashicons-share */
 #available-widgets [class*="share"] .widget-title:before,
-#available-widgets [class*="socia"] .widget-title:before {
-    content: "\f237";
-    content: "\f237" / '';
-}
+#available-widgets [class*="socia"] .widget-title:before { content: "\f237" / ''; }
 
 /* dashicons-translation */
 #available-widgets [class*="lang"] .widget-title:before,
-#available-widgets [class*="translat"] .widget-title:before {
-    content: "\f326";
-    content: "\f326" / '';
-}
+#available-widgets [class*="translat"] .widget-title:before { content: "\f326" / ''; }
 
 /* dashicons-location-alt */
 #available-widgets [class*="locat"] .widget-title:before,
-#available-widgets [class*="map"] .widget-title:before {
-    content: "\f231";
-    content: "\f231" / '';
-}
+#available-widgets [class*="map"] .widget-title:before { content: "\f231" / ''; }
 
 /* dashicons-download */
-#available-widgets [class*="download"] .widget-title:before {
-    content: "\f316";
-    content: "\f316" / '';
-}
+#available-widgets [class*="download"] .widget-title:before { content: "\f316" / ''; }
 
 /* dashicons-cloud */
-#available-widgets [class*="weather"] .widget-title:before {
-    content: "\f176";
-    content: "\f176" / '';
-    top: -4px;
-}
+#available-widgets [class*="weather"] .widget-title:before { content: "\f176" / ''; top: -4px;}
 
 /* dashicons-facebook */
-#available-widgets [class*="facebook"] .widget-title:before {
-    content: "\f304";
-    content: "\f304" / '';
-}
+#available-widgets [class*="facebook"] .widget-title:before { content: "\f304" / ''; }
 
 /* dashicons-twitter */
 #available-widgets [class*="tweet"] .widget-title:before,
-#available-widgets [class*="twitter"] .widget-title:before {
-    content: "\f301";
-    content: "\f301" / '';
-}
+#available-widgets [class*="twitter"] .widget-title:before { content: "\f301" / ''; }
 
 @media screen and (max-height: 700px) and (min-width: 981px) {

branches/6.9/src/wp-admin/css/dashboard.css

@@ -353 +353 @@
 .welcome-panel .welcome-write-blog:before,
 .welcome-panel .welcome-edit-page:before {
-    content: "\f119";
     content: "\f119" / '';
     top: -3px;
@@ -360 +359 @@
 /* @deprecated 5.9.0 -- Icons removed from welcome panel. */
 .welcome-panel .welcome-add-page:before {
-    content: "\f132";
     content: "\f132" / '';
     top: -1px;
@@ -367 +365 @@
 /* @deprecated 5.9.0 -- Icons removed from welcome panel. */
 .welcome-panel .welcome-setup-home:before {
-    content: "\f102";
     content: "\f102" / '';
     top: -1px;
@@ -374 +371 @@
 /* @deprecated 5.9.0 -- Icons removed from welcome panel. */
 .welcome-panel .welcome-view-site:before {
-    content: "\f115";
     content: "\f115" / '';
     top: -2px;
@@ -381 +377 @@
 /* @deprecated 5.9.0 -- Icons removed from welcome panel. */
 .welcome-panel .welcome-widgets-menus:before {
-    content: "\f116";
     content: "\f116" / '';
     top: -2px;
@@ -388 +383 @@
 /* @deprecated 5.9.0 -- Icons removed from welcome panel. */
 .welcome-panel .welcome-widgets:before {
-    content: "\f538";
     content: "\f538" / '';
     top: -2px;
@@ -395 +389 @@
 /* @deprecated 5.9.0 -- Icons removed from welcome panel. */
 .welcome-panel .welcome-menus:before {
-    content: "\f163";
     content: "\f163" / '';
     top: -2px;
@@ -402 +395 @@
 /* @deprecated 5.9.0 -- Icons removed from welcome panel. */
 .welcome-panel .welcome-comments:before {
-    content: "\f117";
     content: "\f117" / '';
     top: -1px;
@@ -409 +401 @@
 /* @deprecated 5.9.0 -- Icons removed from welcome panel. */
 .welcome-panel .welcome-learn-more:before {
-    content: "\f118";
     content: "\f118" / '';
     top: -1px;
@@ -419 +410 @@
 #dashboard_right_now li a:before,
 #dashboard_right_now li > span:before { /* get only the first level span to exclude screen-reader-text in mu-storage */
+    content: "\f159" / ''; /* generic icon for items added by CPTs ? */
     padding: 0 5px 0 0;
-    /* generic icon for items added by CPTs ? */
-    content: "\f159";
-    content: "\f159" / '';
 }
 
 #dashboard_right_now .page-count a:before,
 #dashboard_right_now .page-count span:before {
-    content: "\f105";
     content: "\f105" / '';
 }
@@ -433 +421 @@
 #dashboard_right_now .post-count a:before,
 #dashboard_right_now .post-count span:before {
-    content: "\f109";
     content: "\f109" / '';
 }
 
 #dashboard_right_now .comment-count a:before {
-    content: "\f101";
     content: "\f101" / '';
 }
 
 #dashboard_right_now .comment-mod-count a:before {
-    content: "\f125";
     content: "\f125" / '';
 }
 
 #dashboard_right_now .storage-count a:before {
-    content: "\f104";
     content: "\f104" / '';
 }
 
 #dashboard_right_now .storage-count.warning a:before {
-    content: "\f153";
     content: "\f153" / '';
 }
 
 #dashboard_right_now .search-engines-info:before {
-    content: "\f348";
     content: "\f348" / '';
     color: #d63638;
@@ -578 +560 @@
 
 .community-events .ce-separator::before {
-    content: "\2022";
     content: "\2022" / '';
 }
@@ -594 +575 @@
 }
 .event-meetup .event-icon:before {
-    content: "\f484";
     content: "\f484" / '';
 }
 .event-wordcamp .event-icon:before {
-    content: "\f486";
     content: "\f486" / '';
 }
@@ -881 +860 @@
 
 #dashboard_activity .comment-meta span.approve:before {
-    content: "\f227";
     content: "\f227" / '';
     font: 20px/.5 dashicons;
@@ -1156 +1134 @@
 
 .rss-widget cite:before {
-    content: "\2014";
     content: "\2014" / '';
 }

branches/6.9/src/wp-admin/css/edit.css

@@ -504 +504 @@
 #post-body .misc-pub-post-status:before,
 #post-body .misc-pub-comment-status:before {
-    content: "\f173";
     content: "\f173" / '';
 }
 
 #post-body #visibility:before {
-    content: "\f177";
     content: "\f177" / '';
 }
 
 .curtime #timestamp:before {
-    content: "\f145";
     content: "\f145" / '';
     position: relative;
@@ -521 +518 @@
 
 #post-body .misc-pub-uploadedby:before {
-    content: "\f110";
     content: "\f110" / '';
     position: relative;
@@ -528 +524 @@
 
 #post-body .misc-pub-uploadedto:before {
-    content: "\f318";
     content: "\f318" / '';
     position: relative;
@@ -535 +530 @@
 
 #post-body .misc-pub-revisions:before {
-    content: "\f321";
     content: "\f321" / '';
 }
 
 #post-body .misc-pub-response-to:before {
-    content: "\f101";
     content: "\f101" / '';
 }
@@ -1236 +1229 @@
 
 .post-format-icon.post-format-standard::before {
-    content: "\f109";
     content: "\f109" / '';
 }
 
 .post-format-icon.post-format-image::before {
-    content: "\f128";
     content: "\f128" / '';
 }
 
 .post-format-icon.post-format-gallery::before {
-    content: "\f161";
     content: "\f161" / '';
 }
 
 .post-format-icon.post-format-audio::before {
-    content: "\f127";
     content: "\f127" / '';
 }
 
 .post-format-icon.post-format-video::before {
-    content: "\f126";
     content: "\f126" / '';
 }
 
 .post-format-icon.post-format-chat::before {
-    content: "\f125";
     content: "\f125" / '';
 }
 
 .post-format-icon.post-format-status::before {
-    content: "\f130";
     content: "\f130" / '';
 }
 
 .post-format-icon.post-format-aside::before {
-    content: "\f123";
     content: "\f123" / '';
 }
 
 .post-format-icon.post-format-quote::before {
-    content: "\f122";
     content: "\f122" / '';
 }
 
 .post-format-icon.post-format-link::before {
-    content: "\f103";
     content: "\f103" / '';
 }

branches/6.9/src/wp-admin/css/forms.css

@@ -175 +175 @@
 input[type="checkbox"]:checked::before {
     /* Use the "Yes" SVG Dashicon */
-    content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%233582c4%27%2F%3E%3C%2Fsvg%3E");
     content: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.83%204.89l1.34.94-5.81%208.38H9.02L5.78%209.67l1.34-1.25%202.57%202.4z%27%20fill%3D%27%233582c4%27%2F%3E%3C%2Fsvg%3E") / '';
     margin: -0.1875rem 0 0 -0.25rem;
@@ -241 +240 @@
 
 .form-table .form-required.form-invalid td:after {
-    content: "\f534";
     content: "\f534" / '';
     font: normal 20px/1 dashicons;
@@ -255 +253 @@
 
 .form-table .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after {
-    content: "\f534";
     content: "\f534" / '';
     font: normal 20px/1 dashicons;
@@ -1123 +1120 @@
     color: #787c82;
     font: normal 20px/1 dashicons;
-    content: "\f157";
     content: "\f157" / '';
     position: relative;

branches/6.9/src/wp-admin/css/list-tables.css

@@ -269 +269 @@
 
 th .comment-grey-bubble:before {
-    content: "\f101";
     content: "\f101" / '';
     font: normal 20px/.5 dashicons;
@@ -490 +489 @@
 
 .sorting-indicator.asc:before {
-    content: "\f142";
     content: "\f142" / '';
 }
 
 .sorting-indicator.desc:before {
-    content: "\f140";
     content: "\f140" / '';
 }
@@ -556 +553 @@
     padding: 1px 2px 1px 0;
     color: #3c434a; /* same as table headers sort arrows */
-    content: "\f140";
     content: "\f140" / '';
     font: normal 20px/1 dashicons;
@@ -565 +561 @@
 
 .wp-list-table .is-expanded .toggle-row:before {
-    content: "\f142";
     content: "\f142" / '';
 }
@@ -606 +601 @@
 .locked-indicator-icon:before {
     color: #8c8f94;
-    content: "\f160";
     content: "\f160" / '';
     display: inline-block;
@@ -782 +776 @@
 
 .view-switch .view-list:before {
-    content: "\f163";
     content: "\f163" / '';
 }
 
 .view-switch .view-excerpt:before {
-    content: "\f164";
     content: "\f164" / '';
 }
 
 .view-switch .view-grid:before {
-    content: "\f509";
     content: "\f509" / '';
 }
@@ -1419 +1410 @@
 .plugin-card .update-now:before {
     color: #d63638;
-    content: "\f463";
     content: "\f463" / '';
     display: inline-block;
@@ -1430 +1420 @@
 
 .plugin-card .updating-message:before {
-    content: "\f463";
     content: "\f463" / '';
     animation: rotation 2s infinite linear;
@@ -1446 +1435 @@
 .plugin-card .updated-message:before {
     color: #68de7c;
-    content: "\f147";
     content: "\f147" / '';
 }
@@ -1733 +1721 @@
 
 .plugin-card .column-compatibility .compatibility-incompatible:before {
-    content: "\f158";
     content: "\f158" / '';
     color: #d63638;
@@ -1739 +1726 @@
 
 .plugin-card .column-compatibility .compatibility-compatible:before {
-    content: "\f147";
     content: "\f147" / '';
     color: #007017;

branches/6.9/src/wp-admin/css/media.css

@@ -357 +357 @@
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-    content: "\f158";
     content: "\f158" / '';
 }
@@ -622 +621 @@
 
 .upload-php .media-modal-close .media-modal-icon:before {
-    content: "\f335";
     content: "\f335" / '';
     font-size: 22px;
@@ -695 +693 @@
 
 .edit-attachment-frame .edit-media-header .left:before {
-    content: "\f341";
     content: "\f341" / '';
 }
 
 .edit-attachment-frame .edit-media-header .right:before {
-    content: "\f345";
     content: "\f345" / '';
 }
@@ -1016 +1012 @@
 
 .imgedit-crop:before {
-    content: "\f165";
     content: "\f165" / '';
 }
 
 .imgedit-scale:before {
-    content: "\f211";
     content: "\f211" / '';
 }
 
 .imgedit-rotate:before {
-    content: "\f167";
     content: "\f167" / '';
 }
 
 .imgedit-undo:before {
-    content: "\f171";
     content: "\f171" / '';
 }
 
 .imgedit-redo:before {
-    content: "\f172";
     content: "\f172" / '';
 }

branches/6.9/src/wp-admin/css/revisions.css

@@ -494 +494 @@
     left: 2px;
     color: #50575e;
-    content: "\f229";
     content: "\f229" / '';
     font: normal 18px/1 dashicons;
@@ -513 +512 @@
 
 .wp-slider .ui-slider-handle.from-handle:before {
-    content: "\f139";
     content: "\f139" / '';
 }
 
 .wp-slider .ui-slider-handle.to-handle:before {
-    content: "\f141";
     content: "\f141" / '';
 }
 
 .rtl .wp-slider .ui-slider-handle.from-handle:before {
-    content: "\f141";
     content: "\f141" / '';
 }
 
 .rtl .wp-slider .ui-slider-handle.to-handle:before {
-    content: "\f139";
     content: "\f139" / '';
     right: -1px;

branches/6.9/src/wp-admin/css/site-health.css

@@ -190 +190 @@
 .health-check-body .pass::before,
 .health-check-body .good::before {
-    content: "\f147";
     content: "\f147" / '';
     color: #00a32a;
@@ -196 +195 @@
 
 .health-check-body .warning::before {
-    content: "\f460";
     content: "\f460" / '';
     color: #dba617;
@@ -202 +200 @@
 
 .health-check-body .info::before {
-    content: "\f348";
     content: "\f348" / '';
     color: #72aee6;
@@ -209 +206 @@
 .health-check-body .fail::before,
 .health-check-body .error::before {
-    content: "\f335";
     content: "\f335" / '';
     color: #d63638;

branches/6.9/src/wp-admin/css/themes.css

@@ -305 +305 @@
     border-radius: 50%;
     display: inline-block;
-    content: "\f132";
     content: "\f132" / '';
     -webkit-font-smoothing: antialiased;
@@ -410 +409 @@
     color: #787c82;
     display: inline-block;
-    content: "\f335";
     content: "\f335" / '';
     font-weight: 300;
@@ -470 +468 @@
 
 .theme-overlay .theme-header .left:before {
-    content: "\f341";
     content: "\f341" / '';
 }
 
 .theme-overlay .theme-header .right:before {
-    content: "\f345";
     content: "\f345" / '';
 }
@@ -1027 +1023 @@
 .theme-browser .theme .notice-success p:before {
     color: #68de7c;
-    content: "\f147";
     content: "\f147" / '';
     display: inline-block;
@@ -1523 +1518 @@
 .theme-install-overlay .close-full-overlay:before {
     font: normal 22px/1 dashicons;
-    content: "\f335";
     content: "\f335" / '';
     position: relative;
@@ -1532 +1526 @@
 .theme-install-overlay .previous-theme:before {
     font: normal 20px/1 dashicons;
-    content: "\f341";
     content: "\f341" / '';
     position: relative;
@@ -1541 +1534 @@
 .theme-install-overlay .next-theme:before {
     font: normal 20px/1 dashicons;
-    content: "\f345";
     content: "\f345" / '';
     position: relative;
@@ -1628 +1620 @@
 .wp-full-overlay .collapse-sidebar-arrow:before {
     display: block;
-    content: "\f148";
     content: "\f148" / '';
     background: #f0f0f1;
@@ -1750 +1741 @@
 
 .wp-full-overlay-footer .devices .preview-desktop:before {
-    content: "\f472";
     content: "\f472" / '';
 }
 
 .wp-full-overlay-footer .devices .preview-tablet:before {
-    content: "\f471";
     content: "\f471" / '';
 }
 
 .wp-full-overlay-footer .devices .preview-mobile:before {
-    content: "\f470";
     content: "\f470" / '';
 }

branches/6.9/src/wp-admin/css/widgets.css

@@ -730 +730 @@
 
 .widgets-chooser .widgets-chooser-selected:before {
-    content: "\f147";
     content: "\f147" / '';
     display: block;

branches/6.9/src/wp-includes/css/admin-bar.css

@@ -325 +325 @@
     right: 10px;
     padding: 4px 0;
-    content: "\f139";
     content: "\f139" / '';
     color: inherit;
@@ -338 +337 @@
     top: 1px;
     left: 6px;
-    content: "\f141";
     content: "\f141" / '';
 }
@@ -412 +410 @@
 
 #wp-admin-bar-my-account > .ab-item:before {
-    content: "\f110";
     content: "\f110" / '';
     top: 2px;
@@ -507 +504 @@
 
 #wpadminbar #wp-admin-bar-wp-logo > .ab-item .ab-icon:before {
-    content: "\f120";
     content: "\f120" / '';
     top: 2px;
@@ -538 +534 @@
 
 #wpadminbar .quicklinks li div.blavatar:before {
-    content: "\f120";
     content: "\f120" / '';
     display: inline-block;
@@ -549 +544 @@
 #wpadminbar #wp-admin-bar-my-sites > .ab-item:before,
 #wpadminbar #wp-admin-bar-site-name > .ab-item:before {
-    content: "\f541";
     content: "\f541" / '';
     top: 2px;
@@ -555 +549 @@
 
 #wpadminbar #wp-admin-bar-site-editor > .ab-item:before {
-    content: "\f100";
     content: "\f100" / '';
     top: 2px;
@@ -561 +554 @@
 
 #wpadminbar #wp-admin-bar-customize > .ab-item:before {
-    content: "\f540";
     content: "\f540" / '';
     top: 2px;
@@ -567 +559 @@
 
 #wpadminbar #wp-admin-bar-edit > .ab-item:before {
-    content: "\f464";
     content: "\f464" / '';
     top: 2px;
@@ -573 +564 @@
 
 #wpadminbar #wp-admin-bar-site-name > .ab-item:before {
-    content: "\f226";
     content: "\f226" / '';
 }
 
 .wp-admin #wpadminbar #wp-admin-bar-site-name > .ab-item:before {
-    content: "\f102";
     content: "\f102" / '';
 }
@@ -592 +581 @@
 
 #wpadminbar #wp-admin-bar-comments .ab-icon:before {
-    content: "\f101";
     content: "\f101" / '';
     top: 3px;
@@ -605 +593 @@
  */
 #wpadminbar #wp-admin-bar-new-content .ab-icon:before {
-    content: "\f132";
     content: "\f132" / '';
     top: 4px;
@@ -614 +601 @@
  */
 #wpadminbar #wp-admin-bar-updates .ab-icon:before {
-    content: "\f463";
     content: "\f463" / '';
     top: 2px;
@@ -652 +638 @@
     z-index: 20;
     font: normal 20px/1 dashicons !important;
-    content: "\f179";
     content: "\f179" / '';
     speak: never;

branches/6.9/src/wp-includes/css/editor.css

@@ -923 +923 @@
 
 i.mce-i-bold:before {
-    content: "\f200";
     content: "\f200" / '';
 }
 
 i.mce-i-italic:before {
-    content: "\f201";
     content: "\f201" / '';
 }
 
 i.mce-i-bullist:before {
-    content: "\f203";
     content: "\f203" / '';
 }
 
 i.mce-i-numlist:before {
-    content: "\f204";
     content: "\f204" / '';
 }
 
 i.mce-i-blockquote:before {
-    content: "\f205";
     content: "\f205" / '';
 }
 
 i.mce-i-alignleft:before {
-    content: "\f206";
     content: "\f206" / '';
 }
 
 i.mce-i-aligncenter:before {
-    content: "\f207";
     content: "\f207" / '';
 }
 
 i.mce-i-alignright:before {
-    content: "\f208";
     content: "\f208" / '';
 }
 
 i.mce-i-link:before {
-    content: "\f103";
     content: "\f103" / '';
 }
 
 i.mce-i-unlink:before {
-    content: "\f225";
     content: "\f225" / '';
 }
 
 i.mce-i-wp_more:before {
-    content: "\f209";
     content: "\f209" / '';
 }
 
 i.mce-i-strikethrough:before {
-    content: "\f224";
     content: "\f224" / '';
 }
 
 i.mce-i-spellchecker:before {
-    content: "\f210";
     content: "\f210" / '';
 }
@@ -991 +978 @@
 i.mce-i-dfw:before,
 .qt-dfw:before {
-    content: "\f211";
     content: "\f211" / '';
 }
 
 i.mce-i-wp_adv:before {
-    content: "\f212";
     content: "\f212" / '';
 }
 
 i.mce-i-underline:before {
-    content: "\f213";
     content: "\f213" / '';
 }
 
 i.mce-i-alignjustify:before {
-    content: "\f214";
     content: "\f214" / '';
 }
@@ -1012 +995 @@
 i.mce-i-forecolor:before,
 i.mce-i-backcolor:before {
-    content: "\f215";
     content: "\f215" / '';
 }
 
 i.mce-i-pastetext:before {
-    content: "\f217";
     content: "\f217" / '';
 }
 
 i.mce-i-removeformat:before {
-    content: "\f218";
     content: "\f218" / '';
 }
 
 i.mce-i-charmap:before {
-    content: "\f220";
     content: "\f220" / '';
 }
 
 i.mce-i-outdent:before {
-    content: "\f221";
     content: "\f221" / '';
 }
 
 i.mce-i-indent:before {
-    content: "\f222";
     content: "\f222" / '';
 }
 
 i.mce-i-undo:before {
-    content: "\f171";
     content: "\f171" / '';
 }
 
 i.mce-i-redo:before {
-    content: "\f172";
     content: "\f172" / '';
 }
@@ -1053 +1028 @@
 i.mce-i-help:before,
 i.mce-i-wp_help:before {
-    content: "\f223";
     content: "\f223" / '';
 }
 
 i.mce-i-wp-media-library:before {
-    content: "\f104";
     content: "\f104" / '';
 }
 
 i.mce-i-ltr:before {
-    content: "\f320";
     content: "\f320" / '';
 }
 
 i.mce-i-wp_page:before {
-    content: "\f105";
     content: "\f105" / '';
 }
 
 i.mce-i-hr:before {
-    content: "\f460";
     content: "\f460" / '';
 }
 
 i.mce-i-remove:before {
-    content: "\f158";
     content: "\f158" / '';
 }
 
 i.mce-i-wp_code:before {
-    content: "\f475";
     content: "\f475" / '';
 }
@@ -1089 +1057 @@
 /* RTL button icons */
 .rtl i.mce-i-outdent:before {
-    content: "\f222";
     content: "\f222" / '';
 }
 
 .rtl i.mce-i-indent:before {
-    content: "\f221";
     content: "\f221" / '';
 }
@@ -1246 +1212 @@
 
 .wp-media-buttons .add_media span.wp-media-buttons-icon:before {
-    content: "\f104";
     content: "\f104" / '';
 }
@@ -1464 +1429 @@
     width: 36px;
     height: 36px;
-    content: "\f158";
     content: "\f158" / '';
 }

branches/6.9/src/wp-includes/css/jquery-ui-dialog.css

@@ -303 +303 @@
     width: 36px;
     height: 36px;
-    content: "\f158";
     content: "\f158" / '';
 }

branches/6.9/src/wp-includes/css/media-views.css

@@ -247 +247 @@
 
 .media-modal-close .media-modal-icon:before {
-    content: "\f158";
     content: "\f158" / '';
     font: normal 20px/1 dashicons;
@@ -1247 +1246 @@
     color: #50575e;
     display: inline-block;
-    content: "\f335";
     content: "\f335" / '';
     font-weight: 300;
@@ -2002 +2000 @@
 
 .media-modal .imgedit-help-toggled span.dashicons:before {
-    content: "\f142";
     content: "\f142" / '';
 }
@@ -2185 +2182 @@
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
-    content: "\f140";
     content: "\f140" / '';
     display: inline-block;
@@ -2192 +2188 @@
 
 .image-details .advanced-visible .advanced-toggle:after {
-    content: "\f142";
     content: "\f142" / '';
 }

branches/6.9/src/wp-includes/css/wp-auth-check.css

@@ -94 +94 @@
 
 #wp-auth-check-wrap .wp-auth-check-close:before {
-    content: "\f158";
     content: "\f158" / '';
     font: normal 20px/22px dashicons;

branches/6.9/src/wp-includes/css/wp-pointer.css

@@ -24 +24 @@
     border-radius: 50%;
     color: #2271b1;
-    content: "\f227";
     content: "\f227" / '';
     font: normal 20px/1.6 dashicons;
@@ -66 +65 @@
     background: none;
     color: #787c82;
-    content: "\f153";
     content: "\f153" / '';
     display: block !important;

branches/6.9/src/wp-includes/pluggable.php

@@ -445 +445 @@
 
         try {
-            $phpmailer->setFrom( $from_email, $from_name, false );
+            $phpmailer->setFrom( $from_email, $from_name );
         } catch ( PHPMailer\PHPMailer\Exception $e ) {
             $mail_error_data                             = compact( 'to', 'subject', 'message', 'headers', 'attachments' );

branches/6.9/tests/phpunit/tests/pluggable/wpMail.php

@@ -412 +412 @@
 
     /**
-     * Test that the Sender field in the SMTP envelope is not set by Core.
-     *
-     * Correctly setting the Sender requires knowledge that is not available
-     * to Core. An incorrect value will often lead to messages being rejected
-     * by the receiving MTA, so it's the admin's responsibility to
-     * set it correctly.
-     *
-     * @ticket 37736
-     */
-    public function test_wp_mail_sender_not_set() {
-        wp_mail( 'user@example.org', 'Testing the Sender field', 'The Sender field should not have been set.' );
-
-        $mailer = tests_retrieve_phpmailer_instance();
-
-        $this->assertSame( '', $mailer->Sender );
+     * Test that the Sender field in the SMTP envelope is set by Core.
+     *
+     * A missing Sender field can lead to messages failing DMARC SPF checks.
+     *
+     * @ticket 49687
+     */
+    public function test_wp_mail_sender_set() {
+        wp_mail( 'user@example.org', 'Testing the Sender field', 'The Sender field should have been set.' );
+
+        $mailer = tests_retrieve_phpmailer_instance();
+
+        $this->assertSame( 'wordpress@example.org', $mailer->Sender );
     }