Ticket #41316: 41316.13.diff
| File 41316.13.diff, 19.9 KB (added by , 7 years ago) |
|---|
-
src/wp-admin/css/common.css
diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css index ac3a7c6b65..8613e822e7 100644
a b img.emoji { 764 764 765 765 /* @todo can we combine these into a class or use an existing dashicon one? */ 766 766 .welcome-panel .welcome-panel-close:before, 767 .try-gutenberg-panel .try-gutenberg-panel-close:before, 767 768 .tagchecklist .ntdelbutton .remove-tag-icon:before, 768 769 #bulk-titles div a:before, 769 770 .notice-dismiss:before { -
src/wp-admin/css/dashboard.css
diff --git a/src/wp-admin/css/dashboard.css b/src/wp-admin/css/dashboard.css index f64cc92422..3df875c815 100644
a b 98 98 } 99 99 100 100 /* Welcome Panel */ 101 .welcome-panel { 101 .welcome-panel, 102 .try-gutenberg-panel { 102 103 position: relative; 103 104 overflow: auto; 104 105 margin: 16px 0; … … 110 111 line-height: 2.1em; 111 112 } 112 113 113 .welcome-panel h2 { 114 .welcome-panel h2, 115 .try-gutenberg-panel h2 { 114 116 margin: 0; 115 117 font-size: 21px; 116 118 font-weight: 400; 117 119 line-height: 1.2; 118 120 } 119 121 120 .welcome-panel h3 { 122 .welcome-panel h3, 123 .try-gutenberg-panel h3 { 121 124 margin: 1.33em 0 0; 122 125 font-size: 16px; 123 126 } 124 127 125 .welcome-panel li { 128 .welcome-panel li, 129 .try-gutenberg-panel li { 126 130 font-size: 14px; 127 131 } 128 132 129 .welcome-panel p { 133 .welcome-panel p, 134 .try-gutenberg-panel p, 135 .try-gutenberg-panel-column p.about-description { 130 136 color: #72777c; 131 137 } 132 138 133 .welcome-panel a { 139 .welcome-panel a, 140 .try-gutenberg-panel a { 134 141 text-decoration: none; 135 142 } 136 143 … … 139 146 margin: 0; 140 147 } 141 148 142 .welcome-panel .welcome-panel-close { 149 .try-gutenberg-panel .about-description { 150 font-size: 16px; 151 } 152 153 .welcome-panel .welcome-panel-close, 154 .try-gutenberg-panel .try-gutenberg-panel-close { 143 155 position: absolute; 156 z-index: 10; 144 157 top: 10px; 145 158 right: 10px; 146 159 padding: 10px 15px 10px 21px; … … 149 162 text-decoration: none; 150 163 } 151 164 152 .welcome-panel .welcome-panel-close:before { 165 .welcome-panel .welcome-panel-close:before, 166 .try-gutenberg-panel .try-gutenberg-panel-close:before { 153 167 position: absolute; 154 168 top: 8px; 155 169 left: 0; … … 164 178 white-space: normal; 165 179 } 166 180 167 .welcome-panel-content { 168 margin-left: 13px; 181 .welcome-panel-content, 182 .try-gutenberg-panel-content { 183 margin: 0 13px; 169 184 max-width: 1500px; 170 185 } 171 186 172 .welcome-panel .welcome-panel-column-container { 187 .try-gutenberg-panel img { 188 width: 100%; 189 border: 1px solid #f3f4f5; 190 } 191 192 .try-gutenberg-panel .install-now.updating-message:before, 193 .try-gutenberg-panel .install-now.updated-message:before { 194 margin-top: 11px; 195 } 196 197 .welcome-panel .welcome-panel-column-container, 198 .try-gutenberg-panel .try-gutenberg-panel-column-container { 173 199 clear: both; 174 200 position: relative; 175 201 } 176 202 177 .welcome-panel .welcome-panel-column { 203 .welcome-panel .welcome-panel-column, 204 .try-gutenberg-panel .try-gutenberg-panel-column { 178 205 width: 32%; 179 206 min-width: 200px; 180 207 float: left; 181 208 } 182 209 183 .ie8 .welcome-panel .welcome-panel-column { 210 .try-gutenberg-panel .try-gutenberg-panel-column { 211 width: calc( 64% - 40px ); 212 padding: 0 20px 20px 0; 213 } 214 215 .try-gutenberg-panel .try-gutenberg-panel-image-column { 216 width: calc( 32% - 20px ); 217 } 218 219 .ie8 .welcome-panel .welcome-panel-column, 220 .ie8 .try-gutenberg-panel .try-gutenberg-panel-column { 184 221 min-width: 230px; 185 222 } 186 223 187 .welcome-panel .welcome-panel-column:first-child { 224 .welcome-panel .welcome-panel-column:first-child 225 .try-gutenberg-panel .try-gutenberg-panel-column:first-child { 188 226 width: 36%; 189 227 } 190 228 … … 192 230 margin-top: 10px; 193 231 } 194 232 195 .welcome-panel-column p { 233 .welcome-panel-column p, 234 .try-gutenberg-panel-column p { 196 235 margin-top: 7px; 197 236 color: #444; 198 237 } 199 238 239 .try-gutenberg-panel-column p:last-of-type { 240 margin-top: 1.33em; 241 } 242 200 243 .welcome-panel .welcome-widgets-menus { 201 244 line-height: 16px; 202 245 } 203 246 204 .welcome-panel .welcome-panel-column ul { 205 margin: 0.8em 1em 1em 0; 247 .welcome-panel .welcome-panel-column ul, 248 .try-gutenberg-panel .try-gutenberg-panel-column ul { 249 margin: 0.8em 1em 1em 0; 206 250 } 207 251 208 .welcome-panel .welcome-panel-column li { 252 .welcome-panel .welcome-panel-column li, 253 .try-gutenberg-panel .try-gutenberg-panel-column li { 209 254 line-height: 16px; 210 255 list-style-type: none; 211 256 padding: 0 0 8px; 212 257 } 213 258 259 .try-gutenberg-panel .notice { 260 display: inline-block; 261 } 262 214 263 .welcome-panel .welcome-icon { 215 264 background: transparent !important; 216 265 } … … a.rsswidget { 1207 1256 } 1208 1257 } 1209 1258 1259 @media screen and (max-width: 1024px) { 1260 .try-gutenberg-panel .try-gutenberg-panel-image-column { 1261 display: none; 1262 } 1263 1264 .try-gutenberg-panel .try-gutenberg-panel-column { 1265 width: calc( 98% - 20px ); 1266 } 1267 } 1268 1210 1269 @media screen and (max-width: 870px) { 1211 1270 .welcome-panel .welcome-panel-column, 1271 .try-gutenberg-panel .try-gutenberg-panel-column, 1212 1272 .welcome-panel .welcome-panel-column:first-child { 1213 1273 display: block; 1214 1274 float: none; 1215 1275 width: 100%; 1216 1276 } 1217 1277 1278 .try-gutenberg-panel .try-gutenberg-panel-image-column { 1279 display: none; 1280 } 1281 1218 1282 .welcome-panel .welcome-panel-column li { 1219 1283 display: inline-block; 1220 1284 margin-right: 13px; … … a.rsswidget { 1223 1287 .welcome-panel .welcome-panel-column ul { 1224 1288 margin: 0.4em 0 0; 1225 1289 } 1226 1227 1290 } 1228 1291 1229 1292 @media screen and ( max-width: 782px ) { … … a.rsswidget { 1266 1329 /* Smartphone */ 1267 1330 @media screen and (max-width: 600px) { 1268 1331 /* Keep the close icon from overlapping the Welcome text. */ 1269 .welcome-panel .welcome-panel-close { 1332 .welcome-panel .welcome-panel-close, 1333 .try-gutenberg-panel .try-gutenberg-panel-close { 1270 1334 overflow: hidden; 1271 1335 text-indent: 40px; 1272 1336 white-space: nowrap; … … a.rsswidget { 1278 1342 } 1279 1343 1280 1344 /* Make the close icon larger for tappability. */ 1281 .welcome-panel .welcome-panel-close:before { 1345 .welcome-panel .welcome-panel-close:before, 1346 .try-gutenberg-panel .try-gutenberg-panel-close:before { 1282 1347 font-size: 20px; 1283 1348 top: 5px; 1284 1349 left: -35px; -
src/wp-admin/includes/ajax-actions.php
diff --git a/src/wp-admin/includes/ajax-actions.php b/src/wp-admin/includes/ajax-actions.php index 8fb348c6d3..eb14c51f69 100644
a b function wp_ajax_update_welcome_panel() { 1484 1484 wp_die( 1 ); 1485 1485 } 1486 1486 1487 /** 1488 * Ajax handler for updating whether to display the Try Gutenberg panel. 1489 * 1490 * @since 4.9.6 1491 */ 1492 function wp_ajax_update_try_gutenberg_panel() { 1493 check_ajax_referer( 'try-gutenberg-panel-nonce', 'trygutenbergpanelnonce' ); 1494 1495 update_user_meta( get_current_user_id(), 'show_try_gutenberg_panel', empty( $_POST['visible'] ) ? 0 : 1 ); 1496 1497 wp_die( 1 ); 1498 } 1499 1487 1500 /** 1488 1501 * Ajax handler for retrieving menu meta boxes. 1489 1502 * -
src/wp-admin/includes/class-wp-screen.php
diff --git a/src/wp-admin/includes/class-wp-screen.php b/src/wp-admin/includes/class-wp-screen.php index 0146b56cbf..84cbd9164f 100644
a b final class WP_Screen { 1020 1020 update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked ); 1021 1021 } else { 1022 1022 $welcome_checked = get_user_meta( get_current_user_id(), 'show_welcome_panel', true ); 1023 if ( 2 == $welcome_checked && wp_get_current_user()->user_email != get_option( 'admin_email' ) ) { 1023 if ( '' === $welcome_checked ) { 1024 $welcome_checked = '1'; 1025 } 1026 if ( '2' === $welcome_checked && wp_get_current_user()->user_email != get_option( 'admin_email' ) ) { 1024 1027 $welcome_checked = false; 1025 1028 } 1026 1029 } … … final class WP_Screen { 1028 1031 echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />'; 1029 1032 echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n"; 1030 1033 } 1034 1035 if ( 'dashboard' === $this->id && has_action( 'try_gutenberg_panel' ) ) { 1036 if ( isset( $_GET['try_gutenberg'] ) ) { 1037 $try_gutenberg_checked = empty( $_GET['try_gutenberg'] ) ? 0 : 1; 1038 update_user_meta( get_current_user_id(), 'show_try_gutenberg_panel', $try_gutenberg_checked ); 1039 } else { 1040 $try_gutenberg_checked = get_user_meta( get_current_user_id(), 'show_try_gutenberg_panel', true ); 1041 if ( '' === $try_gutenberg_checked ) { 1042 $try_gutenberg_checked = '1'; 1043 } 1044 if ( '2' === $try_gutenberg_checked && wp_get_current_user()->user_email != get_option( 'admin_email' ) ) { 1045 $try_gutenberg_checked = false; 1046 } 1047 } 1048 echo '<label for="wp_try_gutenberg_panel-hide">'; 1049 echo '<input type="checkbox" id="wp_try_gutenberg_panel-hide"' . checked( (bool) $try_gutenberg_checked, true, false ) . ' />'; 1050 echo __( 'New Editor' ) . "</label>\n"; 1051 } 1031 1052 ?> 1032 1053 </fieldset> 1033 1054 <?php -
src/wp-admin/includes/dashboard.php
diff --git a/src/wp-admin/includes/dashboard.php b/src/wp-admin/includes/dashboard.php index fa1d2ffad4..6db540b9ce 100644
a b function wp_welcome_panel() { 1619 1619 </div> 1620 1620 <?php 1621 1621 } 1622 1623 /** 1624 * Displays a Try Gutenberg Panel, to introduce people to Gutenberg 1625 * 1626 * @since 4.9.6 1627 */ 1628 function wp_try_gutenberg_panel() { 1629 $plugins = get_plugins(); 1630 $action = $url = $classes = ''; 1631 $classic_action = $classic_url = $classic_classes = ''; 1632 1633 if ( current_user_can( 'install_plugins' ) ) { 1634 if ( empty( $plugins['gutenberg/gutenberg.php'] ) ) { 1635 $action = __( 'Install Gutenberg' ); 1636 $url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=gutenberg' ), 'install-plugin_gutenberg' ); 1637 $classes = ' install-now'; 1638 } else if ( is_plugin_inactive( 'gutenberg/gutenberg.php' ) ) { 1639 $action = __( 'Activate Gutenberg' ); 1640 $url = wp_nonce_url( self_admin_url( 'plugins.php?action=activate&plugin=gutenberg/gutenberg.php&from=try-gutenberg' ), 'activate-plugin_gutenberg/gutenberg.php' ); 1641 $classes = ' activate-now'; 1642 } 1643 1644 if ( empty( $plugins['classic-editor/classic-editor.php'] ) ) { 1645 $classic_action = __( 'Install the Classic Editor' ); 1646 $classic_url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=classic-editor' ), 'install-plugin_classic-editor' ); 1647 $classic_classes = ' install-now'; 1648 } else if ( is_plugin_inactive( 'classic-editor/classic-editor.php' ) ) { 1649 $classic_action = __( 'Activate the Classic Editor' ); 1650 $classic_url = wp_nonce_url( self_admin_url( 'plugins.php?action=activate&plugin=classic-editor/classic-editor.php&from=try-gutenberg' ), 'activate-plugin_classic-editor/classic-editor.php' ); 1651 $classic_classes = ' activate-now'; 1652 } 1653 1654 } 1655 1656 if ( current_user_can( 'edit_posts' ) && is_plugin_active( 'gutenberg/gutenberg.php' ) ) { 1657 $action = __( 'Try Gutenberg' ); 1658 $url = admin_url( 'admin.php?page=gutenberg' ); 1659 } 1660 1661 ?> 1662 <div class="try-gutenberg-panel-content plugin-card-gutenberg"> 1663 <h2><?php _e( 'A new, modern publishing experience is coming soon.' ); ?></h2> 1664 1665 <p class="about-description"><?php _e( "Take your words, media, and layout in new directions with Gutenberg, the WordPress editor we're currently building." ); ?></p> 1666 1667 <div class="try-gutenberg-panel-column-container"> 1668 <div class="try-gutenberg-panel-column try-gutenberg-panel-image-column"> 1669 <picture> 1670 <source srcset="about:blank" media="(max-width: 1024px)"> 1671 <img src="https://s.w.org/images/core/gutenberg-screenshot.gif?<?php echo date( 'Ymd' ); ?>" alt="<?php esc_attr_e( 'Gutenberg animated preview' ); ?>" /> 1672 </picture> 1673 </div> 1674 <div class="try-gutenberg-panel-column"> 1675 1676 <h3><?php _e( 'Test the new editor today.' ); ?></h3> 1677 1678 <p> 1679 <?php _e( "You can take Gutenberg for a spin (and share your feedback, if you’d like) before we officially release it, by installing it as a plugin." ); ?> 1680 <?php 1681 printf( 1682 /* translators: 1: Gutenberg call for testing handbook link, 2: Gutenberg GitHub repository issues link, 3: Gutenberg GitHub repository CONTRIBUTING.md link */ 1683 __( 'You can help by <a href="%1$s">testing</a>, <a href="%2$s">filing bugs</a>, or contributing on the <a href="%3$s">GitHub repository</a>.' ), 1684 'https://make.wordpress.org/test/handbook/call-for-testing/gutenberg-testing/', 1685 'https://github.com/WordPress/gutenberg/issues', 1686 'https://github.com/WordPress/gutenberg/blob/master/CONTRIBUTING.md' 1687 ); 1688 ?> 1689 </p> 1690 1691 <?php if ( $action ) { ?> 1692 <p><a class="button button-primary button-hero<?php echo $classes; ?>" href="<?php echo esc_url( $url ); ?>"><?php echo $action; ?></a></p> 1693 <?php } ?> 1694 1695 <p> 1696 <?php 1697 printf( 1698 /* translators: Link to https://wordpress.org/gutenberg/ */ 1699 __( '<a href="%s">Learn more about Gutenberg</a>' ), 1700 'https://wordpress.org/gutenberg/' 1701 ); 1702 ?> 1703 </p> 1704 </div> 1705 <div class="try-gutenberg-panel-column"> 1706 1707 <h3><?php _e( 'Prepare for the transition.' ); ?></h3> 1708 1709 <p> 1710 <?php _e( 'The new editor will be enabled by default in the next major release of WordPress.' ); ?> 1711 <?php 1712 printf( 1713 /* translators: Link to the Classic Editor plugin page */ 1714 __( 'In the mean time, consider installing the <a href="%s">Classic Editor plugin</a>.' ), 1715 'http://wordpress.org/plugins/classic-editor' 1716 ); 1717 ?> 1718 <?php _e( "This will allow you to continue using the classic editor until you're sure there are no conflicts with your theme or plugins." ); ?> 1719 </p> 1720 1721 <?php if ( $classic_action ) { ?> 1722 <p><a class="button button-secondary button-hero<?php echo $classic_classes; ?>" href="<?php echo esc_url( $classic_url ); ?>"><?php echo $classic_action; ?></a></p> 1723 <?php } ?> 1724 </div> 1725 </div> 1726 </div> 1727 <?php 1728 } -
src/wp-admin/index.php
diff --git a/src/wp-admin/index.php b/src/wp-admin/index.php index 783a43b23f..f005388ba2 100644
a b include( ABSPATH . 'wp-admin/admin-header.php' ); 103 103 <div class="wrap"> 104 104 <h1><?php echo esc_html( $title ); ?></h1> 105 105 106 <?php if ( has_action( 'try_gutenberg_panel' ) ) : 107 $classes = 'try-gutenberg-panel'; 108 109 $option = get_user_meta( get_current_user_id(), 'show_try_gutenberg_panel', true ); 110 // 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner 111 $hide = '0' === $option || ( '2' === $option && wp_get_current_user()->user_email !== get_option( 'admin_email' ) ); 112 if ( $hide ) 113 $classes .= ' hidden'; ?> 114 115 <div id="try-gutenberg-panel" class="<?php echo esc_attr( $classes ); ?>"> 116 <?php wp_nonce_field( 'try-gutenberg-panel-nonce', 'trygutenbergpanelnonce', false ); ?> 117 <a class="try-gutenberg-panel-close" href="<?php echo esc_url( admin_url( '?try_gutenberg=0' ) ); ?>" aria-label="<?php esc_attr_e( 'Dismiss the Try Gutenberg panel' ); ?>"><?php _e( 'Dismiss' ); ?></a> 118 <?php 119 /** 120 * Add content to the Try Gutenberg panel on the admin dashboard. 121 * 122 * To remove the Try Gutenberg panel, use remove_action(): 123 * 124 * remove_action( 'try_gutenberg_panel', 'wp_try_gutenberg_panel' ); 125 * 126 * @since 4.9.6 127 */ 128 do_action( 'try_gutenberg_panel' ); 129 ?> 130 </div> 131 <?php endif; ?> 106 132 <?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) : 107 133 $classes = 'welcome-panel'; 108 134 109 135 $option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true ); 110 136 // 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner 111 $hide = 0 == $option || ( 2== $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) );137 $hide = '0' === $option || ( '2' === $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) ); 112 138 if ( $hide ) 113 139 $classes .= ' hidden'; ?> 114 140 -
src/wp-admin/js/dashboard.js
diff --git a/src/wp-admin/js/dashboard.js b/src/wp-admin/js/dashboard.js index a6b56c37ef..8b6c4bbfa4 100644
a b jQuery(document).ready( function($) { 31 31 updateWelcomePanel( this.checked ? 1 : 0 ); 32 32 }); 33 33 34 var tryGutenbergPanel = $( '#try-gutenberg-panel' ), 35 tryGutenbergPanelHide = $('#wp_try_gutenberg_panel-hide'), 36 updateTryGutenbergPanel, installGutenbergSuccess; 37 38 updateTryGutenbergPanel = function( visible ) { 39 $.post( ajaxurl, { 40 action: 'update-try-gutenberg-panel', 41 visible: visible, 42 trygutenbergpanelnonce: $( '#trygutenbergpanelnonce' ).val() 43 }); 44 }; 45 46 installGutenbergSuccess = function( response ) { 47 response.activateUrl += '&from=try-gutenberg'; 48 wp.updates.installPluginSuccess( response ); 49 }; 50 51 if ( tryGutenbergPanel.hasClass('hidden') && tryGutenbergPanelHide.prop('checked') ) { 52 tryGutenbergPanel.removeClass('hidden'); 53 } 54 55 $('.try-gutenberg-panel-close, .try-gutenberg-panel-dismiss a', tryGutenbergPanel).click( function(e) { 56 e.preventDefault(); 57 tryGutenbergPanel.addClass('hidden'); 58 updateTryGutenbergPanel( 0 ); 59 $('#wp_try_gutenberg_panel-hide').prop('checked', false); 60 }); 61 62 tryGutenbergPanelHide.click( function() { 63 tryGutenbergPanel.toggleClass('hidden', ! this.checked ); 64 updateTryGutenbergPanel( this.checked ? 1 : 0 ); 65 }); 66 67 tryGutenbergPanel.on( 'click', '.install-now', function( e ) { 68 e.preventDefault(); 69 var args = { 70 slug: 'gutenberg', 71 success: installGutenbergSuccess 72 }; 73 wp.updates.installPlugin( args ); 74 } ); 75 34 76 // These widgets are sometimes populated via ajax 35 77 ajaxWidgets = ['dashboard_primary']; 36 78 -
src/wp-admin/js/updates.js
diff --git a/src/wp-admin/js/updates.js b/src/wp-admin/js/updates.js index 22229a6f51..0bfabafba0 100644
a b 585 585 586 586 $message 587 587 .removeClass( 'updating-message' ) 588 .addClass( 'updated-message installed button-disabled' )588 .addClass( 'updated-message installed' ) 589 589 .attr( 'aria-label', wp.updates.l10n.pluginInstalledLabel.replace( '%s', response.pluginName ) ) 590 590 .text( wp.updates.l10n.pluginInstalled ); 591 591 592 if ( $message.hasClass( 'button-primary' ) ) { 593 $message.addClass( 'button-primary-disabled' ); 594 } else if ( $message.hasClass( 'button-secondary' ) ) { 595 $message.addClass( 'button-secondary-disabled' ); 596 } else { 597 $message.addClass( 'button-disabled' ); 598 } 599 592 600 wp.a11y.speak( wp.updates.l10n.installedMsg, 'polite' ); 593 601 594 602 $document.trigger( 'wp-plugin-install-success', response ); … … 597 605 setTimeout( function() { 598 606 599 607 // Transform the 'Install' button into an 'Activate' button. 600 $message.removeClass( 'install-now installed button-disabled updated-message' ).addClass( 'activate-now button-primary' ) 608 $message.removeClass( 'install-now installed button-primary-disabled button-secondary-disabled button-disabled updated-message' ) 609 .addClass( 'activate-now button-primary' ) 601 610 .attr( 'href', response.activateUrl ) 602 611 .attr( 'aria-label', wp.updates.l10n.activatePluginLabel.replace( '%s', response.pluginName ) ) 603 612 .text( wp.updates.l10n.activatePlugin ); -
src/wp-admin/plugins.php
diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php index b92a7964e6..5b221c3fef 100644
a b if ( $action ) { 65 65 wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix 66 66 } else if ( isset($_GET['from']) && 'press-this' == $_GET['from'] ) { 67 67 wp_redirect( self_admin_url( "press-this.php") ); 68 } else if ( isset($_GET['from']) && 'try-gutenberg' == $_GET['from'] ) { 69 wp_redirect( self_admin_url( "admin.php?page=gutenberg") ); 68 70 } else { 69 71 wp_redirect( self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above 70 72 } -
src/wp-includes/default-filters.php
diff --git a/src/wp-includes/default-filters.php b/src/wp-includes/default-filters.php index e012beb182..fb8af82daf 100644
a b add_action( 'transition_post_status', '_transition_post_status', 318 318 add_action( 'transition_post_status', '_update_term_count_on_transition_post_status', 10, 3 ); 319 319 add_action( 'comment_form', 'wp_comment_form_unfiltered_html_nonce' ); 320 320 add_action( 'admin_init', 'send_frame_options_header', 10, 0 ); 321 add_action( 'try_gutenberg_panel', 'wp_try_gutenberg_panel' ); 321 322 add_action( 'welcome_panel', 'wp_welcome_panel' ); 322 323 323 324 // Privacy