Changeset 9315

Timestamp:

10/24/2008 05:47:55 AM (18 years ago)

Author:

ryan

Message:

use activate_plugin for error scraping, pass full WP_Error object to wp_die(), whitespace cleanups. Props DD32. fixes #7671

File:

• trunk/wp-admin/plugins.php (modified) (13 diffs)

trunk/wp-admin/plugins.php

@@ -29 +29 @@
                         $result = activate_plugin($plugin, 'plugins.php?error=true&plugin=' . $plugin);
                         if ( is_wp_error( $result ) )
-                                wp_die( $result->get_error_message() );
+                                wp_die($result);
                         $recent = (array)get_option('recently_activated');
-                        if( isset($recent[ $plugin ]) ){
+                        if ( isset($recent[ $plugin ]) ) {
                                 unset($recent[ $plugin ]);
                                 update_option('recently_activated', $recent);
@@ -44 +44 @@
                         $recent = (array)get_option('recently_activated');
                         foreach( (array)$_POST['checked'] as $plugin => $time) {
-                                if( isset($recent[ $plugin ]) )
+                                if ( isset($recent[ $plugin ]) )
                                         unset($recent[ $plugin ]);
                         }
@@ -60 +60 @@
                         error_reporting( E_ALL ^ E_NOTICE );
                         @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
-                        include(WP_PLUGIN_DIR . '/' . $plugin);
+                        $result = activate_plugin($plugin, false); 
+                        if ( is_wp_error( $result ) ) 
+                                wp_die($result);
                         exit;
                         break;
@@ -74 +76 @@
                         deactivate_plugins($_POST['checked']);
                         $deactivated = array();
-                        foreach( (array)$_POST['checked'] as $plugin )
+                        foreach ( (array)$_POST['checked'] as $plugin )
                                 $deactivated[ $plugin ] = time();
                         update_option('recently_activated', $deactivated + (array)get_option('recently_activated'));
@@ -81 +83 @@
                         break;
                 case 'delete-selected':
-                        if( ! current_user_can('delete_plugins') )
+                        if ( ! current_user_can('delete_plugins') )
                                 wp_die(__('You do not have sufficient permissions to delete plugins for this blog.'));
 
@@ -92 +94 @@
                         $parent_file = 'plugins.php';
 
-                        if( ! isset($_REQUEST['verify-delete']) ) {
+                        if ( ! isset($_REQUEST['verify-delete']) ) {
                                 wp_enqueue_script('jquery');
                                 require_once('admin-header.php');
@@ -100 +102 @@
                                 <?php
                                         $files_to_delete = $plugin_info = array();
-                                        foreach( (array) $plugins as $plugin ) {
-                                                if( '.' == dirname($plugin) ) {
+                                        foreach ( (array) $plugins as $plugin ) {
+                                                if ( '.' == dirname($plugin) ) {
                                                         $files_to_delete[] = WP_PLUGIN_DIR . '/' . $plugin;
                                                         if( $data = get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin) )
@@ -121 +123 @@
                                         <ul>
                                                 <?php
-                                                foreach( $plugin_info as $plugin )
+                                                foreach ( $plugin_info as $plugin )
                                                         echo '<li>', sprintf(__('%s by %s'), $plugin['Name'], $plugin['Author']), '</li>';
                                                 ?>
@@ -131 +133 @@
                                         <input type="hidden" name="delete-selected" value="1" />
                                         <?php
-                                                foreach( (array)$plugins as $plugin )
+                                                foreach ( (array)$plugins as $plugin )
                                                         echo '<input type="hidden" name="checked[]" value="' . attribute_escape($plugin) . '" />';
                                         ?>
@@ -145 +147 @@
                                         <ul>
                                         <?php
-                                                foreach( (array)$files_to_delete as $file )
+                                                foreach ( (array)$files_to_delete as $file )
                                                         echo '<li>' . str_replace(WP_PLUGIN_DIR, '', $file) . '</li>';
                                         ?>
@@ -173 +175 @@
 
 $invalid = validate_active_plugins();
-if( !empty($invalid) )
-        foreach($invalid as $plugin_file => $error)
+if ( !empty($invalid) )
+        foreach ( $invalid as $plugin_file => $error )
                 echo '<div id="message" class="error"><p>' . sprintf(__('The plugin <code>%s</code> has been <strong>deactivated</strong> due to an error: %s'), wp_specialchars($plugin_file), $error->get_error_message()) . '</p></div>';
 ?>
@@ -216 +218 @@
 
 //Clean out any plugins which were deactivated over a week ago.
-foreach( $recently_activated as $key => $time )
-        if( $time + (7*24*60*60) < time() ) //1 week
+foreach ( $recently_activated as $key => $time )
+        if ( $time + (7*24*60*60) < time() ) //1 week
                 unset($recently_activated[ $key ]);
-if( $recently_activated != get_option('recently_activated') ) //If array changed, update it.
+if ( $recently_activated != get_option('recently_activated') ) //If array changed, update it.
         update_option('recently_activated', $recently_activated);
 
-foreach( (array)$all_plugins as $plugin_file => $plugin_data) {
+foreach ( (array)$all_plugins as $plugin_file => $plugin_data) {
 
         //Translate, Apply Markup, Sanitize HTML
@@ -273 +275 @@
 <?php
 
-        if( empty($plugins) ) {
+        if ( empty($plugins) ) {
                 echo '<tr>
                         <td colspan="6">' . __('No plugins to show') . '</td>
                 </tr>';
         }
-        foreach( (array)$plugins as $plugin_file => $plugin_data) {
+        foreach ( (array)$plugins as $plugin_file => $plugin_data) {
                 $action_links = array();
 
-                if( 'active' == $context )
+                if ( 'active' == $context )
                         $action_links[] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '" class="delete">' . __('Deactivate') . '</a>';
                 else //Inactive or Recently deactivated