Ticket #7671: 7671.2.diff
File 7671.2.diff, 5.9 KB (added by , 16 years ago) |
---|
-
wp-admin/plugins.php
28 28 check_admin_referer('activate-plugin_' . $plugin); 29 29 $result = activate_plugin($plugin, 'plugins.php?error=true&plugin=' . $plugin); 30 30 if ( is_wp_error( $result ) ) 31 wp_die( $result->get_error_message());31 wp_die($result); 32 32 $recent = (array)get_option('recently_activated'); 33 if ( isset($recent[ $plugin ]) ){33 if ( isset($recent[ $plugin ]) ) { 34 34 unset($recent[ $plugin ]); 35 35 update_option('recently_activated', $recent); 36 36 } … … 43 43 44 44 $recent = (array)get_option('recently_activated'); 45 45 foreach( (array)$_POST['checked'] as $plugin => $time) { 46 if ( isset($recent[ $plugin ]) )46 if ( isset($recent[ $plugin ]) ) 47 47 unset($recent[ $plugin ]); 48 48 } 49 49 if( $recent != get_option('recently_activated') ) //If array changed, update it. … … 59 59 wp_die($valid); 60 60 error_reporting( E_ALL ^ E_NOTICE ); 61 61 @ini_set('display_errors', true); //Ensure that Fatal errors are displayed. 62 include(WP_PLUGIN_DIR . '/' . $plugin); 62 $result = activate_plugin($plugin, false); 63 if ( is_wp_error( $result ) ) 64 wp_die($result); 63 65 exit; 64 66 break; 65 67 case 'deactivate': … … 73 75 check_admin_referer('bulk-manage-plugins'); 74 76 deactivate_plugins($_POST['checked']); 75 77 $deactivated = array(); 76 foreach ( (array)$_POST['checked'] as $plugin )78 foreach ( (array)$_POST['checked'] as $plugin ) 77 79 $deactivated[ $plugin ] = time(); 78 80 update_option('recently_activated', $deactivated + (array)get_option('recently_activated')); 79 81 wp_redirect('plugins.php?deactivate-multi=true'); 80 82 exit; 81 83 break; 82 84 case 'delete-selected': 83 if ( ! current_user_can('delete_plugins') )85 if ( ! current_user_can('delete_plugins') ) 84 86 wp_die(__('You do not have sufficient permissions to delete plugins for this blog.')); 85 87 86 88 check_admin_referer('bulk-manage-plugins'); … … 91 93 $title = __('Delete Plugin'); 92 94 $parent_file = 'plugins.php'; 93 95 94 if ( ! isset($_REQUEST['verify-delete']) ) {96 if ( ! isset($_REQUEST['verify-delete']) ) { 95 97 wp_enqueue_script('jquery'); 96 98 require_once('admin-header.php'); 97 99 ?> … … 99 101 <h2><?php _e('Delete Plugin(s)'); ?></h2> 100 102 <?php 101 103 $files_to_delete = $plugin_info = array(); 102 foreach ( (array) $plugins as $plugin ) {103 if ( '.' == dirname($plugin) ) {104 foreach ( (array) $plugins as $plugin ) { 105 if ( '.' == dirname($plugin) ) { 104 106 $files_to_delete[] = WP_PLUGIN_DIR . '/' . $plugin; 105 107 if( $data = get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin) ) 106 108 $plugin_info[ $plugin ] = $data; … … 120 122 <p> 121 123 <ul> 122 124 <?php 123 foreach ( $plugin_info as $plugin )125 foreach ( $plugin_info as $plugin ) 124 126 echo '<li>', sprintf(__('%s by %s'), $plugin['Name'], $plugin['Author']), '</li>'; 125 127 ?> 126 128 </ul> … … 130 132 <input type="hidden" name="verify-delete" value="1" /> 131 133 <input type="hidden" name="delete-selected" value="1" /> 132 134 <?php 133 foreach ( (array)$plugins as $plugin )135 foreach ( (array)$plugins as $plugin ) 134 136 echo '<input type="hidden" name="checked[]" value="' . attribute_escape($plugin) . '" />'; 135 137 ?> 136 138 <?php wp_nonce_field('bulk-manage-plugins') ?> … … 144 146 <div id="files-list" style="display:none;"> 145 147 <ul> 146 148 <?php 147 foreach ( (array)$files_to_delete as $file )149 foreach ( (array)$files_to_delete as $file ) 148 150 echo '<li>' . str_replace(WP_PLUGIN_DIR, '', $file) . '</li>'; 149 151 ?> 150 152 </ul> … … 172 174 require_once('admin-header.php'); 173 175 174 176 $invalid = validate_active_plugins(); 175 if ( !empty($invalid) )176 foreach ($invalid as $plugin_file => $error)177 if ( !empty($invalid) ) 178 foreach ( $invalid as $plugin_file => $error ) 177 179 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>'; 178 180 ?> 179 181 … … 215 217 $recently_activated = (array) get_option('recently_activated'); 216 218 217 219 //Clean out any plugins which were deactivated over a week ago. 218 foreach ( $recently_activated as $key => $time )219 if ( $time + (7*24*60*60) < time() ) //1 week220 foreach ( $recently_activated as $key => $time ) 221 if ( $time + (7*24*60*60) < time() ) //1 week 220 222 unset($recently_activated[ $key ]); 221 if ( $recently_activated != get_option('recently_activated') ) //If array changed, update it.223 if ( $recently_activated != get_option('recently_activated') ) //If array changed, update it. 222 224 update_option('recently_activated', $recently_activated); 223 225 224 foreach ( (array)$all_plugins as $plugin_file => $plugin_data) {226 foreach ( (array)$all_plugins as $plugin_file => $plugin_data) { 225 227 226 228 //Translate, Apply Markup, Sanitize HTML 227 229 $plugin_data = _get_plugin_data_markup_translate($plugin_data, true, true); … … 272 274 <tbody class="plugins"> 273 275 <?php 274 276 275 if ( empty($plugins) ) {277 if ( empty($plugins) ) { 276 278 echo '<tr> 277 279 <td colspan="6">' . __('No plugins to show') . '</td> 278 280 </tr>'; 279 281 } 280 foreach ( (array)$plugins as $plugin_file => $plugin_data) {282 foreach ( (array)$plugins as $plugin_file => $plugin_data) { 281 283 $action_links = array(); 282 284 283 if ( 'active' == $context )285 if ( 'active' == $context ) 284 286 $action_links[] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&plugin=' . $plugin_file, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '" class="delete">' . __('Deactivate') . '</a>'; 285 287 else //Inactive or Recently deactivated 286 288 $action_links[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';