Changeset 16006 for trunk/wp-admin/plugins.php
- Timestamp:
- 10/27/2010 10:25:13 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/plugins.php
r15956 r16006 33 33 check_admin_referer('activate-plugin_' . $plugin); 34 34 35 $result = activate_plugin($plugin, 'plugins.php?error=true&plugin=' . $plugin, $network_wide);35 $result = activate_plugin($plugin, admin_url('plugins.php?error=true&plugin=' . $plugin), $network_wide); 36 36 if ( is_wp_error( $result ) ) { 37 37 if ( 'unexpected_output' == $result->get_error_code() ) { 38 $redirect = 'plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin . "&plugin_status=$status&paged=$page&s=$s";38 $redirect = admin_url('plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin . "&plugin_status=$status&paged=$page&s=$s"); 39 39 wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); 40 40 exit; … … 50 50 } 51 51 if ( isset($_GET['from']) && 'import' == $_GET['from'] ) { 52 wp_redirect( "import.php?import=" . str_replace('-importer', '', dirname($plugin)) ); // overrides the ?error=true one above and redirects to the Imports page, striping the -importer suffix52 wp_redirect( admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, striping the -importer suffix 53 53 } else { 54 wp_redirect( "plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s"); // overrides the ?error=true one above54 wp_redirect( admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above 55 55 } 56 56 exit; … … 66 66 $plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); // Only activate plugins which are not already active. 67 67 if ( empty($plugins) ) { 68 wp_redirect( "plugins.php?plugin_status=$status&paged=$page&s=$s");68 wp_redirect( admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") ); 69 69 exit; 70 70 } 71 71 72 activate_plugins($plugins, 'plugins.php?error=true', $network_wide);72 activate_plugins($plugins, admin_url('plugins.php?error=true'), $network_wide); 73 73 74 74 $recent = (array)get_option('recently_activated'); … … 79 79 update_option('recently_activated', $recent); 80 80 81 wp_redirect( "plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s");81 wp_redirect( admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s") ); 82 82 exit; 83 83 break; … … 103 103 104 104 105 $url = 'update.php?action=update-selected&plugins=' . urlencode( join(',', $plugins));105 $url = admin_url('update.php?action=update-selected&plugins=' . urlencode( join(',', $plugins) )); 106 106 $url = wp_nonce_url($url, 'bulk-update-plugins'); 107 107 … … 144 144 deactivate_plugins($plugin); 145 145 update_option('recently_activated', array($plugin => time()) + (array)get_option('recently_activated')); 146 if ( headers_sent())146 if ( headers_sent() ) 147 147 echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />"; 148 148 else 149 wp_redirect( "plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s");149 wp_redirect( admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s") ); 150 150 exit; 151 151 break; … … 159 159 $plugins = array_filter($plugins, 'is_plugin_active'); //Do not deactivate plugins which are already deactivated. 160 160 if ( empty($plugins) ) { 161 wp_redirect( "plugins.php?plugin_status=$status&paged=$page&s=$s");161 wp_redirect( admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") ); 162 162 exit; 163 163 } … … 170 170 171 171 update_option('recently_activated', $deactivated + (array)get_option('recently_activated')); 172 wp_redirect( "plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s");172 wp_redirect( admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s") ); 173 173 exit; 174 174 break; … … 183 183 $plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); //Do not allow to delete Activated plugins. 184 184 if ( empty($plugins) ) { 185 wp_redirect( "plugins.php?plugin_status=$status&paged=$page&s=$s");185 wp_redirect( admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") ); 186 186 exit; 187 187 } … … 276 276 $delete_result = delete_plugins($plugins); 277 277 278 set_transient('plugins_delete_result_' .$user_ID, $delete_result); //Store the result in a cache rather than a URL param due to object type & length279 wp_redirect( "plugins.php?deleted=true&plugin_status=$status&paged=$page&s=$s");278 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 279 wp_redirect( admin_url("plugins.php?deleted=true&plugin_status=$status&paged=$page&s=$s") ); 280 280 exit; 281 281 break;
Note: See TracChangeset
for help on using the changeset viewer.