WordPress 4.0.1-scripts

[autoinstalls/wordpress.git] / wp-admin / plugins.php

diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 9c3aa457f1d898aaa4c5c02f00a4e802c217b5e5..988cfa932514e1dc1e22f0cb79d00738bdb1b348 100644 (file)
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -60,7 +60,7 @@ if ( $action ) {
                                wp_redirect( self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above
                        }
                        exit;
-                       break;
+
                case 'activate-selected':
                        if ( ! current_user_can('activate_plugins') )
                                wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
@@ -101,7 +101,7 @@ if ( $action ) {
 
                        wp_redirect( self_admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s") );
                        exit;
-                       break;
+
                case 'update-selected' :
 
                        check_admin_referer( 'bulk-plugins' );
@@ -129,7 +129,7 @@ if ( $action ) {
                        echo '</div>';
                        require_once(ABSPATH . 'wp-admin/admin-footer.php');
                        exit;
-                       break;
+
                case 'error_scrape':
                        if ( ! current_user_can('activate_plugins') )
                                wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
@@ -154,7 +154,7 @@ if ( $action ) {
                        /** This action is documented in wp-admin/includes/plugins.php */
                        do_action( "activate_{$plugin}" );
                        exit;
-                       break;
+
                case 'deactivate':
                        if ( ! current_user_can('activate_plugins') )
                                wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));
@@ -174,7 +174,7 @@ if ( $action ) {
                        else
                                wp_redirect( self_admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s") );
                        exit;
-                       break;
+
                case 'deactivate-selected':
                        if ( ! current_user_can('activate_plugins') )
                                wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));
@@ -205,7 +205,7 @@ if ( $action ) {
 
                        wp_redirect( self_admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s") );
                        exit;
-                       break;
+
                case 'delete-selected':
                        if ( ! current_user_can('delete_plugins') )
                                wp_die(__('You do not have sufficient permissions to delete plugins for this site.'));
@@ -324,7 +324,7 @@ if ( $action ) {
                        set_transient('plugins_delete_result_' . $user_ID, $delete_result); //Store the result in a cache rather than a URL param due to object type & length
                        wp_redirect( self_admin_url("plugins.php?deleted=true&plugin_status=$status&paged=$page&s=$s") );
                        exit;
-                       break;
+
                case 'clear-recent-list':
                        if ( ! is_network_admin() )
                                update_option( 'recently_activated', array() );
@@ -380,7 +380,7 @@ if ( !empty($invalid) )
        else
                $errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
        ?>
-       <div id="message" class="updated"><p><?php echo $errmsg; ?></p>
+       <div id="message" class="error"><p><?php echo $errmsg; ?></p>
        <?php
                if ( !isset( $_GET['main'] ) && !isset($_GET['charsout']) && wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $plugin) ) { ?>
        <iframe style="border:0" width="100%" height="70px" src="<?php echo 'plugins.php?action=error_scrape&amp;plugin=' . esc_attr($plugin) . '&amp;_wpnonce=' . esc_attr($_GET['_error_nonce']); ?>"></iframe>
@@ -394,7 +394,7 @@ if ( !empty($invalid) )
                delete_transient( 'plugins_delete_result_' . $user_ID );
 
                if ( is_wp_error($delete_result) ) : ?>
-               <div id="message" class="updated"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message() ); ?></p></div>
+               <div id="message" class="error"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message() ); ?></p></div>
                <?php else : ?>
                <div id="message" class="updated"><p><?php _e('The selected plugins have been <strong>deleted</strong>.'); ?></p></div>
                <?php endif; ?>