Changeset 44717

Timestamp:

01/30/2019 11:00:30 AM (8 years ago)

Author:

flixos90

Message:

Bootstrap/Load: Revert fatal error recovery mechanism from 5.1 to polish for 5.2.

Due to the high number of follow-up tickets and associated security concerns, it was decided to reschedule the fatal error recovery feature for WordPress 5.2, in order to address these issues properly. The feature will continue to be developed, with iterations being merged into trunk early in the 5.2 release cycle.

Fixes #46141. See #44458, #45932, #45940, #46038, #46047, #46068.

Location:

trunk

Files:

• src/wp-admin/css/list-tables.css (modified) (1 diff)
• src/wp-admin/includes/admin-filters.php (modified) (1 diff)
• src/wp-admin/includes/class-wp-plugins-list-table.php (modified) (13 diffs)
• src/wp-admin/includes/plugin.php (modified) (6 diffs)
• src/wp-admin/includes/theme.php (modified) (1 diff)
• src/wp-admin/plugins.php (modified) (3 diffs)
• src/wp-admin/themes.php (modified) (5 diffs)
• src/wp-includes/capabilities.php (modified) (1 diff)
• src/wp-includes/class-wp-fatal-error-handler.php (deleted)
• src/wp-includes/class-wp-paused-extensions-storage.php (deleted)
• src/wp-includes/class-wp-theme.php (modified) (1 diff)
• src/wp-includes/error-protection.php (deleted)
• src/wp-includes/load.php (modified) (3 diffs)
• src/wp-includes/ms-load.php (modified) (1 diff)
• src/wp-settings.php (modified) (2 diffs)
• tests/phpunit/tests/user/capabilities.php (modified) (3 diffs)

trunk/src/wp-admin/css/list-tables.css

@@ -1302 +1302 @@
 }
 
-.plugins tr.paused th.check-column {
-        border-left: 4px solid #d54e21;
-}
-
-.plugins tr.paused th,
-.plugins tr.paused td {
-        background-color: #fef7f1;
-}
-
-.plugins tr.paused .plugin-title,
-.plugins .paused .dashicons-warning {
-        color: #dc3232;
-}
-
-.plugins .paused .error-display p,
-.plugins .paused .error-display code {
-        font-size: 90%;
-        font-style: italic;
-        color: rgb( 0, 0, 0, 0.7 );
-}
-
-.plugins .resume-link {
-        color: #dc3232;
-}
-
 .plugin-card .update-now:before {
         color: #f56e28;

trunk/src/wp-admin/includes/admin-filters.php

@@ -118 +118 @@
 
 add_action( 'admin_notices', 'update_nag', 3 );
-add_action( 'admin_notices', 'paused_plugins_notice', 5 );
-add_action( 'admin_notices', 'paused_themes_notice', 5 );
 add_action( 'admin_notices', 'maintenance_nag', 10 );
 

trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -41 +41 @@
 
                 $status = 'all';
-                if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search', 'paused' ) ) ) {
+                if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) ) {
                         $status = $_REQUEST['plugin_status'];
                 }
@@ -100 +100 @@
                         'mustuse'            => array(),
                         'dropins'            => array(),
-                        'paused'             => array(),
                 );
 
@@ -211 +210 @@
                                         // On the non-network screen, show network-active plugins if allowed
                                         $plugins['active'][ $plugin_file ] = $plugin_data;
-                                        if ( is_plugin_paused( $plugin_file ) ) {
-                                                $plugins['paused'][ $plugin_file ] = $plugin_data;
-                                        }
                                 } else {
                                         // On the non-network screen, filter out network-active plugins
@@ -223 +219 @@
                                 // On the network-admin screen, populate the active list with plugins that are network activated
                                 $plugins['active'][ $plugin_file ] = $plugin_data;
-                                if ( is_plugin_paused( $plugin_file ) ) {
-                                        $plugins['paused'][ $plugin_file ] = $plugin_data;
-                                }
                         } else {
                                 if ( isset( $recently_activated[ $plugin_file ] ) ) {
@@ -453 +446 @@
                                         $text = _n( 'Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count );
                                         break;
-                                case 'paused':
-                                        /* translators: %s: plugin count */
-                                        $text = _n( 'Paused <span class="count">(%s)</span>', 'Paused <span class="count">(%s)</span>', $count );
-                                        break;
                                 case 'upgrade':
                                         /* translators: %s: plugin count */
@@ -645 +634 @@
                                                 $actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Network Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Deactivate' ) . '</a>';
                                         }
-                                        if ( current_user_can( 'manage_network_plugins' ) && count_paused_plugin_sites_for_network( $plugin_file ) ) {
-                                                /* translators: %s: plugin name */
-                                                $actions['resume'] = '<a class="resume-link" href="' . wp_nonce_url( 'plugins.php?action=resume&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'resume-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Network Resume %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Resume' ) . '</a>';
-                                        }
                                 } else {
                                         if ( current_user_can( 'manage_network_plugins' ) ) {
                                                 /* translators: %s: plugin name */
                                                 $actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( _x( 'Network Activate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Activate' ) . '</a>';
-                                        }
-                                        if ( current_user_can( 'manage_network_plugins' ) && count_paused_plugin_sites_for_network( $plugin_file ) ) {
-                                                /* translators: %s: plugin name */
-                                                $actions['resume'] = '<a class="resume-link" href="' . wp_nonce_url( 'plugins.php?action=resume&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'resume-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Network Resume %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Resume' ) . '</a>';
                                         }
                                         if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) {
@@ -668 +649 @@
                                                 'network_active' => __( 'Network Active' ),
                                         );
-                                        if ( ! $restrict_network_only && current_user_can( 'resume_plugin', $plugin_file ) && is_plugin_paused( $plugin_file ) ) {
-                                                /* translators: %s: plugin name */
-                                                $actions['resume'] = '<a class="resume-link" href="' . wp_nonce_url( 'plugins.php?action=resume&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'resume-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Resume %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Resume' ) . '</a>';
-                                        }
                                 } elseif ( $restrict_network_only ) {
                                         $actions = array(
@@ -681 +658 @@
                                                 $actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
                                         }
-                                        if ( current_user_can( 'resume_plugin', $plugin_file ) && is_plugin_paused( $plugin_file ) ) {
-                                                /* translators: %s: plugin name */
-                                                $actions['resume'] = '<a class="resume-link" href="' . wp_nonce_url( 'plugins.php?action=resume&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'resume-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Resume %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Resume' ) . '</a>';
-                                        }
                                 } else {
                                         if ( current_user_can( 'activate_plugin', $plugin_file ) ) {
@@ -790 +763 @@
                 if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) ) {
                         $class .= ' update';
-                }
-
-                $paused                        = is_plugin_paused( $plugin_file );
-                $paused_on_network_sites_count = $screen->in_admin( 'network' ) ? count_paused_plugin_sites_for_network( $plugin_file ) : 0;
-                if ( $paused || $paused_on_network_sites_count ) {
-                        $class .= ' paused';
                 }
 
@@ -879 +846 @@
                                          * @param string   $status      Status of the plugin. Defaults are 'All', 'Active',
                                          *                              'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
-                                         *                              'Drop-ins', 'Search', 'Paused'.
+                                         *                              'Drop-ins', 'Search'.
                                          */
                                         $plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
@@ -885 +852 @@
 
                                         echo '</div>';
-
-                                        if ( $paused || $paused_on_network_sites_count ) {
-                                                $notice_text = __( 'This plugin failed to load properly and was paused within the admin backend.' );
-                                                if ( $screen->in_admin( 'network' ) && $paused_on_network_sites_count ) {
-                                                        $notice_text = sprintf(
-                                                                /* translators: %s: number of sites */
-                                                                _n( 'This plugin failed to load properly and was paused within the admin backend for %s site.', 'This plugin failed to load properly and was paused within the admin backend for %s sites.', $paused_on_network_sites_count ),
-                                                                number_format_i18n( $paused_on_network_sites_count )
-                                                        );
-                                                }
-
-                                                printf( '<p><span class="dashicons dashicons-warning"></span> <strong>%s</strong></p>', $notice_text );
-
-                                                $error = wp_get_plugin_error( $plugin_file );
-
-                                                if ( false !== $error ) {
-                                                        $constants = get_defined_constants( true );
-                                                        $constants = isset( $constants['Core'] ) ? $constants['Core'] : $constants['internal'];
-
-                                                        foreach ( $constants as $constant => $value ) {
-                                                                if ( 0 === strpos( $constant, 'E_' ) ) {
-                                                                        $core_errors[ $value ] = $constant;
-                                                                }
-                                                        }
-
-                                                        $error['type'] = $core_errors[ $error['type'] ];
-
-                                                        printf(
-                                                                '<div class="error-display"><p>%s</p></div>',
-                                                                sprintf(
-                                                                        /* translators: 1: error type, 2: error line number, 3: error file name, 4: error message */
-                                                                        __( 'The plugin caused an error of type %1$s in line %2$s of the file %3$s. Error message: %4$s' ),
-                                                                        "<code>{$error['type']}</code>",
-                                                                        "<code>{$error['line']}</code>",
-                                                                        "<code>{$error['file']}</code>",
-                                                                        "<code>{$error['message']}</code>"
-                                                                )
-                                                        );
-                                                }
-                                        }
 
                                         echo '</td>';
@@ -959 +886 @@
                  * @param string $status      Status of the plugin. Defaults are 'All', 'Active',
                  *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
-                 *                            'Drop-ins', 'Search', 'Paused'.
+                 *                            'Drop-ins', 'Search'.
                  */
                 do_action( 'after_plugin_row', $plugin_file, $plugin_data, $status );
@@ -975 +902 @@
                  * @param string $status      Status of the plugin. Defaults are 'All', 'Active',
                  *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
-                 *                            'Drop-ins', 'Search', 'Paused'.
+                 *                            'Drop-ins', 'Search'.
                  */
                 do_action( "after_plugin_row_{$plugin_file}", $plugin_file, $plugin_data, $status );

trunk/src/wp-admin/includes/plugin.php

@@ -469 +469 @@
 function _get_dropins() {
         $dropins = array(
-                'advanced-cache.php'      => array( __( 'Advanced caching plugin.' ), 'WP_CACHE' ), // WP_CACHE
-                'db.php'                  => array( __( 'Custom database class.' ), true ), // auto on load
-                'db-error.php'            => array( __( 'Custom database error message.' ), true ), // auto on error
-                'install.php'             => array( __( 'Custom installation script.' ), true ), // auto on installation
-                'maintenance.php'         => array( __( 'Custom maintenance message.' ), true ), // auto on maintenance
-                'object-cache.php'        => array( __( 'External object cache.' ), true ), // auto on load
-                'php-error.php'           => array( __( 'Custom PHP error message.' ), true ), // auto on error
-                'fatal-error-handler.php' => array( __( 'Custom PHP fatal error handler.' ), true ), // auto on error
+                'advanced-cache.php' => array( __( 'Advanced caching plugin.' ), 'WP_CACHE' ), // WP_CACHE
+                'db.php'             => array( __( 'Custom database class.' ), true ), // auto on load
+                'db-error.php'       => array( __( 'Custom database error message.' ), true ), // auto on error
+                'install.php'        => array( __( 'Custom installation script.' ), true ), // auto on installation
+                'maintenance.php'    => array( __( 'Custom maintenance message.' ), true ), // auto on maintenance
+                'object-cache.php'   => array( __( 'External object cache.' ), true ), // auto on load
         );
 
@@ -527 +525 @@
 function is_plugin_inactive( $plugin ) {
         return ! is_plugin_active( $plugin );
-}
-
-/**
- * Determines whether a plugin is technically active but was paused while
- * loading.
- *
- * 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 5.1.0
- *
- * @param string $plugin Path to the plugin file relative to the plugins directory.
- * @return bool True, if in the list of paused plugins. False, not in the list.
- */
-function is_plugin_paused( $plugin ) {
-        if ( ! isset( $GLOBALS['_paused_plugins'] ) ) {
-                return false;
-        }
-
-        if ( ! is_plugin_active( $plugin ) && ! is_plugin_active_for_network( $plugin ) ) {
-                return false;
-        }
-
-        list( $plugin ) = explode( '/', $plugin );
-
-        return array_key_exists( $plugin, $GLOBALS['_paused_plugins'] );
-}
-
-/**
- * Gets the error that was recorded for a paused plugin.
- *
- * @since 5.1.0
- *
- * @param string $plugin Path to the plugin file relative to the plugins
- *                       directory.
- * @return array|false Array of error information as it was returned by
- *                     `error_get_last()`, or false if none was recorded.
- */
-function wp_get_plugin_error( $plugin ) {
-        if ( ! isset( $GLOBALS['_paused_plugins'] ) ) {
-                return false;
-        }
-
-        list( $plugin ) = explode( '/', $plugin );
-
-        if ( ! array_key_exists( $plugin, $GLOBALS['_paused_plugins'] ) ) {
-                return false;
-        }
-
-        return $GLOBALS['_paused_plugins'][ $plugin ];
-}
-
-/**
- * Gets the number of sites on which a specific plugin is paused.
- *
- * @since 5.1.0
- *
- * @param string $plugin Path to the plugin file relative to the plugins directory.
- * @return int Site count.
- */
-function count_paused_plugin_sites_for_network( $plugin ) {
-        if ( ! is_multisite() ) {
-                return is_plugin_paused( $plugin ) ? 1 : 0;
-        }
-
-        list( $plugin ) = explode( '/', $plugin );
-
-        $query_args = array(
-                'count'      => true,
-                'number'     => 0,
-                'network_id' => get_current_network_id(),
-                'meta_query' => array(
-                        wp_paused_plugins()->get_site_meta_query_clause( $plugin ),
-                ),
-        );
-
-        return get_sites( $query_args );
 }
 
@@ -802 +722 @@
                 if ( ! is_plugin_active( $plugin ) ) {
                         continue;
-                }
-
-                // Clean up the database before deactivating the plugin.
-                if ( is_plugin_paused( $plugin ) ) {
-                        resume_plugin( $plugin );
                 }
 
@@ -1003 +918 @@
                 }
 
-                // Clean up the database before removing the plugin.
-                if ( is_plugin_paused( $plugin_file ) ) {
-                        resume_plugin( $plugin_file );
-                }
-
                 /**
                  * Fires immediately before a plugin deletion attempt.
@@ -1080 +990 @@
 
                 return new WP_Error( 'could_not_remove_plugin', sprintf( $message, implode( ', ', $errors ) ) );
-        }
-
-        return true;
-}
-
-/**
- * Tries to resume a single plugin.
- *
- * If a redirect was provided, we first ensure the plugin does not throw fatal
- * errors anymore.
- *
- * The way it works is by setting the redirection to the error before trying to
- * include the plugin file. If the plugin fails, then the redirection will not
- * be overwritten with the success message and the plugin will not be resumed.
- *
- * @since 5.1.0
- *
- * @param string $plugin       Single plugin to resume.
- * @param string $redirect     Optional. URL to redirect to. Default empty string.
- * @param bool   $network_wide Optional. Whether to resume the plugin for the entire
- *                             network. Default false.
- * @return bool|WP_Error True on success, false if `$plugin` was not paused,
- *                       `WP_Error` on failure.
- */
-function resume_plugin( $plugin, $redirect = '', $network_wide = false ) {
-        /*
-         * We'll override this later if the plugin could be included without
-         * creating a fatal error.
-         */
-        if ( ! empty( $redirect ) ) {
-                wp_redirect(
-                        add_query_arg(
-                                '_error_nonce',
-                                wp_create_nonce( 'plugin-resume-error_' . $plugin ),
-                                $redirect
-                        )
-                );
-
-                // Load the plugin to test whether it throws a fatal error.
-                ob_start();
-                plugin_sandbox_scrape( $plugin );
-                ob_clean();
-        }
-
-        $result = wp_forget_extension_error( 'plugins', $plugin, $network_wide );
-
-        if ( ! $result ) {
-                return new WP_Error(
-                        'could_not_resume_plugin',
-                        __( 'Could not resume the plugin.' )
-                );
         }
 
@@ -2243 +2102 @@
         WP_Privacy_Policy_Content::add( $plugin_name, $policy_text );
 }
-
-/**
- * Renders an admin notice in case some plugins have been paused due to errors.
- *
- * @since 5.1.0
- */
-function paused_plugins_notice() {
-        if ( 'plugins.php' === $GLOBALS['pagenow'] ) {
-                return;
-        }
-
-        if ( ! current_user_can( 'deactivate_plugins' ) ) {
-                return;
-        }
-
-        if ( ! isset( $GLOBALS['_paused_plugins'] ) || empty( $GLOBALS['_paused_plugins'] ) ) {
-                return;
-        }
-
-        printf(
-                '<div class="notice notice-error"><p><strong>%s</strong><br>%s</p><p>%s</p></div>',
-                __( 'One or more plugins failed to load properly.' ),
-                __( 'You can find more details and make changes on the Plugins screen.' ),
-                sprintf(
-                        '<a href="%s">%s</a>',
-                        admin_url( 'plugins.php?plugin_status=paused' ),
-                        'Go to the Plugins screen'
-                )
-        );
-}

trunk/src/wp-admin/includes/theme.php

@@ -769 +769 @@
         <?php
 }
-
-/**
- * Determines whether a theme is technically active but was paused while
- * loading.
- *
- * 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 5.1.0
- *
- * @param string $theme Path to the theme directory relative to the themes directory.
- * @return bool True, if in the list of paused themes. False, not in the list.
- */
-function is_theme_paused( $theme ) {
-        if ( ! isset( $GLOBALS['_paused_themes'] ) ) {
-                return false;
-        }
-
-        if ( $theme !== get_stylesheet() && $theme !== get_template() ) {
-                return false;
-        }
-
-        return array_key_exists( $theme, $GLOBALS['_paused_themes'] );
-}
-
-/**
- * Gets the error that was recorded for a paused theme.
- *
- * @since 5.1.0
- *
- * @param string $theme Path to the theme directory relative to the themes
- *                      directory.
- * @return array|false Array of error information as it was returned by
- *                     `error_get_last()`, or false if none was recorded.
- */
-function wp_get_theme_error( $theme ) {
-        if ( ! isset( $GLOBALS['_paused_themes'] ) ) {
-                return false;
-        }
-
-        if ( ! array_key_exists( $theme, $GLOBALS['_paused_themes'] ) ) {
-                return false;
-        }
-
-        return $GLOBALS['_paused_themes'][ $theme ];
-}
-
-/**
- * Gets the number of sites on which a specific theme is paused.
- *
- * @since 5.1.0
- *
- * @param string $theme Path to the theme directory relative to the themes directory.
- * @return int Site count.
- */
-function count_paused_theme_sites_for_network( $theme ) {
-        if ( ! is_multisite() ) {
-                return is_theme_paused( $theme ) ? 1 : 0;
-        }
-
-        $query_args = array(
-                'count'      => true,
-                'number'     => 0,
-                'network_id' => get_current_network_id(),
-                'meta_query' => array(
-                        wp_paused_themes()->get_site_meta_query_clause( $theme ),
-                ),
-        );
-
-        return get_sites( $query_args );
-}
-
-/**
- * Tries to resume a single theme.
- *
- * @since 5.1.0
- *
- * @param string $theme Single theme to resume.
- * @return bool|WP_Error True on success, false if `$theme` was not paused,
- *                       `WP_Error` on failure.
- */
-function resume_theme( $theme ) {
-        $result = wp_forget_extension_error( 'themes', $theme );
-
-        if ( ! $result ) {
-                return new WP_Error(
-                        'could_not_resume_theme',
-                        __( 'Could not resume the theme.' )
-                );
-        }
-
-        return true;
-}
-
-/**
- * Renders an admin notice in case some themes have been paused due to errors.
- *
- * @since 5.1.0
- */
-function paused_themes_notice() {
-        if ( 'themes.php' === $GLOBALS['pagenow'] ) {
-                return;
-        }
-
-        if ( ! current_user_can( 'switch_themes' ) ) {
-                return;
-        }
-
-        if ( ! isset( $GLOBALS['_paused_themes'] ) || empty( $GLOBALS['_paused_themes'] ) ) {
-                return;
-        }
-
-        printf(
-                '<div class="notice notice-error"><p><strong>%s</strong><br>%s</p><p>%s</p></div>',
-                __( 'One or more themes failed to load properly.' ),
-                __( 'You can find more details and make changes on the Themes screen.' ),
-                sprintf(
-                        '<a href="%s">%s</a>',
-                        admin_url( 'themes.php' ),
-                        'Go to the Themes screen'
-                )
-        );
-}

trunk/src/wp-admin/plugins.php

@@ -390 +390 @@
                         break;
 
-                case 'resume':
-                        if ( ! current_user_can( 'resume_plugin', $plugin ) ) {
-                                wp_die( __( 'Sorry, you are not allowed to resume this plugin.' ) );
-                        }
-
-                        if ( is_multisite() && ! is_network_admin() && is_network_only_plugin( $plugin ) ) {
-                                wp_redirect( self_admin_url( "plugins.php?plugin_status=$status&paged=$page&s=$s" ) );
-                                exit;
-                        }
-
-                        check_admin_referer( 'resume-plugin_' . $plugin );
-
-                        $result = resume_plugin( $plugin, self_admin_url( 'plugins.php?error=resuming' ), is_network_admin() );
-
-                        if ( is_wp_error( $result ) ) {
-                                wp_die( $result );
-                        }
-
-                        wp_redirect( self_admin_url( "plugins.php?resume=true&plugin_status=$status&paged=$page&s=$s" ) );
-                        exit;
-
                 default:
                         if ( isset( $_POST['checked'] ) ) {
@@ -510 +489 @@
                 );
                 $errmsg .= ' ' . __( 'If you notice “headers already sent” messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.' );
-        } elseif ( 'resuming' === $_GET['error'] ) {
-                $errmsg = __( 'Plugin could not be resumed because it triggered a <strong>fatal error</strong>.' );
         } else {
                 $errmsg = __( 'Plugin could not be activated because it triggered a <strong>fatal error</strong>.' );
@@ -565 +542 @@
 <?php elseif ( 'update-selected' == $action ) : ?>
         <div id="message" class="updated notice is-dismissible"><p><?php _e( 'All selected plugins are up to date.' ); ?></p></div>
-<?php elseif ( isset( $_GET['resume'] ) ) : ?>
-        <div id="message" class="updated notice is-dismissible"><p><?php _e( 'Plugin <strong>resumed</strong>.' ); ?></p></div>
 <?php endif; ?>
 

trunk/src/wp-admin/themes.php

@@ -33 +33 @@
                 switch_theme( $theme->get_stylesheet() );
                 wp_redirect( admin_url( 'themes.php?activated=true' ) );
-                exit;
-        } elseif ( 'resume' === $_GET['action'] ) {
-                check_admin_referer( 'resume-theme_' . $_GET['stylesheet'] );
-                $theme = wp_get_theme( $_GET['stylesheet'] );
-
-                if ( ! current_user_can( 'resume_themes' ) ) {
-                        wp_die(
-                                '<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
-                                '<p>' . __( 'Sorry, you are not allowed to resume this theme.' ) . '</p>',
-                                403
-                        );
-                }
-
-                $result = resume_theme( $theme->get_stylesheet() );
-
-                if ( is_wp_error( $result ) ) {
-                        wp_die( $result );
-                }
-
-                wp_redirect( admin_url( 'themes.php?resumed=true' ) );
                 exit;
         } elseif ( 'delete' == $_GET['action'] ) {
@@ -216 +196 @@
         <div id="message4" class="error"><p><?php _e( 'You cannot delete a theme while it has an active child theme.' ); ?></p></div>
         <?php
-} elseif ( isset( $_GET['resumed'] ) ) {
-        ?>
-        <div id="message5" class="updated notice is-dismissible"><p><?php _e( 'Theme resumed.' ); ?></p></div>
-        <?php
 }
 
@@ -373 +349 @@
 
         <?php
-        $can_resume  = current_user_can( 'resume_themes' );
         $can_delete  = current_user_can( 'delete_themes' );
         $can_install = current_user_can( 'install_themes' );
@@ -381 +356 @@
                 <th><?php _ex( 'Name', 'theme name' ); ?></th>
                 <th><?php _e( 'Description' ); ?></th>
-                <?php if ( $can_resume ) { ?>
-                        <td></td>
-                <?php } ?>
                 <?php if ( $can_delete ) { ?>
                         <td></td>
@@ -396 +368 @@
                         <td><?php echo $broken_theme->errors()->get_error_message(); ?></td>
                         <?php
-                        if ( $can_resume ) {
-                                if ( 'theme_paused' === $broken_theme->errors()->get_error_code() ) {
-                                        $stylesheet = $broken_theme->get_stylesheet();
-                                        $resume_url = add_query_arg(
-                                                array(
-                                                        'action'     => 'resume',
-                                                        'stylesheet' => urlencode( $stylesheet ),
-                                                ),
-                                                admin_url( 'themes.php' )
-                                        );
-                                        $resume_url = wp_nonce_url( $resume_url, 'resume-theme_' . $stylesheet );
-                                        ?>
-                                        <td><a href="<?php echo esc_url( $resume_url ); ?>" class="button resume-theme"><?php _e( 'Resume' ); ?></a></td>
-                                        <?php
-                                } else {
-                                        ?>
-                                        <td></td>
-                                        <?php
-                                }
-                        }
-
                         if ( $can_delete ) {
                                 $stylesheet = $broken_theme->get_stylesheet();

trunk/src/wp-includes/capabilities.php

@@ -465 +465 @@
                         }
                         break;
-                case 'resume_plugin':
-                        // Even in a multisite, regular administrators should be able to resume a plugin.
-                        $caps[] = 'activate_plugins';
-                        break;
-                case 'resume_themes':
-                        // Even in a multisite, regular administrators should be able to resume a theme.
-                        $caps[] = 'switch_themes';
-                        break;
                 case 'delete_user':
                 case 'delete_users':

trunk/src/wp-includes/class-wp-theme.php

@@ -370 +370 @@
                         // Set the parent. Pass the current instance so we can do the crazy checks above and assess errors.
                         $this->parent = new WP_Theme( $this->template, isset( $theme_root_template ) ? $theme_root_template : $this->theme_root, $this );
-                }
-
-                if ( wp_paused_themes()->get( $this->stylesheet ) && ( ! is_wp_error( $this->errors ) || ! isset( $this->errors->errors['theme_paused'] ) ) ) {
-                        $this->errors = new WP_Error( 'theme_paused', __( 'This theme failed to load properly and was paused within the admin backend.' ) );
                 }
 

trunk/src/wp-includes/load.php

@@ -698 +698 @@
         }
 
-        /*
-         * Remove plugins from the list of active plugins when we're on an endpoint
-         * that should be protected against WSODs and the plugin is paused.
-         */
-        if ( is_protected_endpoint() ) {
-                $plugins = wp_skip_paused_plugins( $plugins );
-        }
-
-        return $plugins;
-}
-
-/**
- * Filters a given list of plugins, removing any paused plugins from it.
- *
- * @since 5.1.0
- *
- * @param array $plugins List of absolute plugin main file paths.
- * @return array Filtered value of $plugins, without any paused plugins.
- */
-function wp_skip_paused_plugins( array $plugins ) {
-        $paused_plugins = wp_paused_plugins()->get_all();
-
-        if ( empty( $paused_plugins ) ) {
-                return $plugins;
-        }
-
-        foreach ( $plugins as $index => $plugin ) {
-                list( $plugin ) = explode( '/', plugin_basename( $plugin ) );
-
-                if ( array_key_exists( $plugin, $paused_plugins ) ) {
-                        unset( $plugins[ $index ] );
-
-                        // Store list of paused plugins for displaying an admin notice.
-                        $GLOBALS['_paused_plugins'][ $plugin ] = $paused_plugins[ $plugin ];
-                }
-        }
-
         return $plugins;
 }
@@ -762 +725 @@
 
         $themes[] = TEMPLATEPATH;
-
-        /*
-         * Remove themes from the list of active themes when we're on an endpoint
-         * that should be protected against WSODs and the theme is paused.
-         */
-        if ( is_protected_endpoint() ) {
-                $themes = wp_skip_paused_themes( $themes );
-
-                // If no active and valid themes exist, skip loading themes.
-                if ( empty( $themes ) ) {
-                        add_filter( 'wp_using_themes', '__return_false' );
-                }
-        }
-
-        return $themes;
-}
-
-/**
- * Filters a given list of themes, removing any paused themes from it.
- *
- * @since 5.1.0
- *
- * @param array $themes List of absolute theme directory paths.
- * @return array Filtered value of $themes, without any paused themes.
- */
-function wp_skip_paused_themes( array $themes ) {
-        $paused_themes = wp_paused_themes()->get_all();
-
-        if ( empty( $paused_themes ) ) {
-                return $themes;
-        }
-
-        foreach ( $themes as $index => $theme ) {
-                $theme = basename( $theme );
-
-                if ( array_key_exists( $theme, $paused_themes ) ) {
-                        unset( $themes[ $index ] );
-
-                        // Store list of paused themes for displaying an admin notice.
-                        $GLOBALS['_paused_themes'][ $theme ] = $paused_themes[ $theme ];
-                }
-        }
 
         return $themes;
@@ -1291 +1212 @@
 
 /**
- * Determines whether we are currently on an endpoint that should be protected against WSODs.
- *
- * @since 5.1.0
- *
- * @return bool True if the current endpoint should be protected.
- */
-function is_protected_endpoint() {
-        // Protect login pages.
-        if ( isset( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {
-                return true;
-        }
-
-        // Protect the admin backend.
-        if ( is_admin() && ! wp_doing_ajax() ) {
-                return true;
-        }
-
-        // Protect AJAX actions that could help resolve a fatal error should be available.
-        if ( is_protected_ajax_action() ) {
-                return true;
-        }
-
-        /**
-         * Filters whether the current request is against a protected endpoint.
-         *
-         * This filter is only fired when an endpoint is requested which is not already protected by
-         * WordPress core. As such, it exclusively allows providing further protected endpoints in
-         * addition to the admin backend, login pages and protected AJAX actions.
-         *
-         * @since 5.1.0
-         *
-         * @param bool $is_protected_endpoint Whether the currently requested endpoint is protected. Default false.
-         */
-        return (bool) apply_filters( 'is_protected_endpoint', false );
-}
-
-/**
- * Determines whether we are currently handling an AJAX action that should be protected against WSODs.
- *
- * @since 5.1.0
- *
- * @return bool True if the current AJAX action should be protected.
- */
-function is_protected_ajax_action() {
-        if ( ! wp_doing_ajax() ) {
-                return false;
-        }
-
-        if ( ! isset( $_REQUEST['action'] ) ) {
-                return false;
-        }
-
-        $actions_to_protect = array(
-                'edit-theme-plugin-file', // Saving changes in the core code editor.
-                'heartbeat',              // Keep the heart beating.
-                'install-plugin',         // Installing a new plugin.
-                'install-theme',          // Installing a new theme.
-                'search-plugins',         // Searching in the list of plugins.
-                'search-install-plugins', // Searching for a plugin in the plugin install screen.
-                'update-plugin',          // Update an existing plugin.
-                'update-theme',           // Update an existing theme.
-        );
-
-        /**
-         * Filters the array of protected AJAX actions.
-         *
-         * This filter is only fired when doing AJAX and the AJAX request has an 'action' property.
-         *
-         * @since 5.1.0
-         *
-         * @param array $actions_to_protect Array of strings with AJAX actions to protect.
-         */
-        $actions_to_protect = (array) apply_filters( 'wp_protected_ajax_actions', $actions_to_protect );
-
-        if ( ! in_array( $_REQUEST['action'], $actions_to_protect, true ) ) {
-                return false;
-        }
-
-        return true;
-}
-
-/**
  * Determines whether the current request is a WordPress cron request.
  *

trunk/src/wp-includes/ms-load.php

@@ -52 +52 @@
                         $plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
                 }
-        }
-
-        /*
-         * Remove plugins from the list of active plugins when we're on an endpoint
-         * that should be protected against WSODs and the plugin is paused.
-         */
-        if ( is_protected_endpoint() ) {
-                $plugins = wp_skip_paused_plugins( $plugins );
         }
 

trunk/src/wp-settings.php

@@ -18 +18 @@
 // Include files required for initialization.
 require( ABSPATH . WPINC . '/load.php' );
-require( ABSPATH . WPINC . '/class-wp-paused-extensions-storage.php' );
-require( ABSPATH . WPINC . '/class-wp-fatal-error-handler.php' );
-require( ABSPATH . WPINC . '/error-protection.php' );
 require( ABSPATH . WPINC . '/default-constants.php' );
 require_once( ABSPATH . WPINC . '/plugin.php' );
-
-// Make sure we register the shutdown handler for fatal errors as soon as possible.
-wp_register_fatal_error_handler();
 
 /*
@@ -531 +525 @@
  */
 do_action( 'wp_loaded' );
-
-/*
- * Store the fact that we could successfully execute the entire WordPress
- * lifecycle. This is used to skip the premature shutdown handler, as it cannot
- * be unregistered.
- */
-if ( ! defined( 'WP_EXECUTION_SUCCEEDED' ) ) {
-        define( 'WP_EXECUTION_SUCCEEDED', true );
-}

trunk/tests/phpunit/tests/user/capabilities.php

@@ -258 +258 @@
                         'erase_others_personal_data'  => array( 'administrator' ),
                         'manage_privacy_options'      => array( 'administrator' ),
-                        'resume_themes'               => array( 'administrator' ),
 
                         'edit_categories'             => array( 'administrator', 'editor' ),
@@ -298 +297 @@
                         'delete_site'                 => array( 'administrator' ),
                         'add_users'                   => array( 'administrator' ),
-                        'resume_themes'               => array( 'administrator' ),
 
                         'edit_categories'             => array( 'administrator', 'editor' ),
@@ -457 +455 @@
                         $expected['activate_plugin'],
                         $expected['deactivate_plugin'],
-                        $expected['resume_plugin'],
                         $expected['remove_user'],
                         $expected['promote_user'],