vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-30 23:30:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Importer support to Plugin Install workflow, Offers to Activate Plugin & Run installer, and returning to Imports upon successful Importer Plugin Installation. See #13566

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@14985 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse
2010-05-27 11:04:08 +00:00
parent a6194f1e0c
commit 94487bb9ea
5 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wp-admin/plugins.php
View File

@@ -51,7 +51,7 @@ if ( !empty($action) ) {
$result = activate_plugin($plugin, 'plugins.php?error=true&plugin=' . $plugin, $network_wide);
if ( is_wp_error( $result ) ) {
if ('unexpected_output' == $result->get_error_code()) {
if ( 'unexpected_output' == $result->get_error_code() ) {
$redirect = 'plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin;
wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
exit;
@@ -65,8 +65,11 @@ if ( !empty($action) ) {
unset($recent[ $plugin ]);
update_option('recently_activated', $recent);
}
wp_redirect("plugins.php?activate=true&plugin_status=$status&paged=$page"); // overrides the ?error=true one above
if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
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 suffix
} else {
wp_redirect("plugins.php?activate=true&plugin_status=$status&paged=$page"); // overrides the ?error=true one above
}
exit;
break;
case 'activate-selected':
@@ -437,7 +440,7 @@ $total_network_plugins = count($network_plugins);
$total_mustuse_plugins = count($mustuse_plugins);
$total_dropins_plugins = count($dropins_plugins);
//Searching.
// Searching.
if ( !empty($_GET['s']) ) {
function _search_plugins_filter_callback($plugin) {
static $term;