Skip to content

Commit

Permalink
Use Absolute URL's in header redirects in wp-admin/plugin.php. See #1…
Browse files Browse the repository at this point in the history 
…4062

git-svn-id: http://svn.automattic.com/wordpress/trunk@16006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
dd32 committed Oct 27, 2010
1 parent 9f9f520 commit bcc3bb2
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions wp-admin/plugins.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@

check_admin_referer('activate-plugin_' . $plugin);

$result = activate_plugin($plugin, 'plugins.php?error=true&plugin=' . $plugin, $network_wide);
$result = activate_plugin($plugin, admin_url('plugins.php?error=true&plugin=' . $plugin), $network_wide);
if ( is_wp_error( $result ) ) {
if ( 'unexpected_output' == $result->get_error_code() ) {
$redirect = 'plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin . "&plugin_status=$status&paged=$page&s=$s";
$redirect = admin_url('plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin . "&plugin_status=$status&paged=$page&s=$s");
wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
exit;
} else {
Expand All @@ -49,9 +49,9 @@
update_option('recently_activated', $recent);
}
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
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
} else {
wp_redirect("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s"); // overrides the ?error=true one above
wp_redirect( admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above
}
exit;
break;
Expand All @@ -65,11 +65,11 @@
$plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
$plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); // Only activate plugins which are not already active.
if ( empty($plugins) ) {
wp_redirect("plugins.php?plugin_status=$status&paged=$page&s=$s");
wp_redirect( admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
exit;
}

activate_plugins($plugins, 'plugins.php?error=true', $network_wide);
activate_plugins($plugins, admin_url('plugins.php?error=true'), $network_wide);

$recent = (array)get_option('recently_activated');
foreach ( $plugins as $plugin => $time)
Expand All @@ -78,7 +78,7 @@

update_option('recently_activated', $recent);

wp_redirect("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s");
wp_redirect( admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s") );
exit;
break;
case 'update-selected' :
Expand All @@ -102,7 +102,7 @@
echo '<h2>' . esc_html( $title ) . '</h2>';


$url = 'update.php?action=update-selected&amp;plugins=' . urlencode( join(',', $plugins) );
$url = admin_url('update.php?action=update-selected&amp;plugins=' . urlencode( join(',', $plugins) ));
$url = wp_nonce_url($url, 'bulk-update-plugins');

echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
Expand Down Expand Up @@ -143,10 +143,10 @@ function plugin_sandbox_scrape( $plugin ) {
check_admin_referer('deactivate-plugin_' . $plugin);
deactivate_plugins($plugin);
update_option('recently_activated', array($plugin => time()) + (array)get_option('recently_activated'));
if (headers_sent())
if ( headers_sent() )
echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
else
wp_redirect("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s");
wp_redirect( admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s") );
exit;
break;
case 'deactivate-selected':
Expand All @@ -158,7 +158,7 @@ function plugin_sandbox_scrape( $plugin ) {
$plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
$plugins = array_filter($plugins, 'is_plugin_active'); //Do not deactivate plugins which are already deactivated.
if ( empty($plugins) ) {
wp_redirect("plugins.php?plugin_status=$status&paged=$page&s=$s");
wp_redirect( admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
exit;
}

Expand All @@ -169,7 +169,7 @@ function plugin_sandbox_scrape( $plugin ) {
$deactivated[ $plugin ] = time();

update_option('recently_activated', $deactivated + (array)get_option('recently_activated'));
wp_redirect("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s");
wp_redirect( admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s") );
exit;
break;
case 'delete-selected':
Expand All @@ -182,7 +182,7 @@ function plugin_sandbox_scrape( $plugin ) {
$plugins = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
$plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); //Do not allow to delete Activated plugins.
if ( empty($plugins) ) {
wp_redirect("plugins.php?plugin_status=$status&paged=$page&s=$s");
wp_redirect( admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
exit;
}

Expand Down Expand Up @@ -275,8 +275,8 @@ function plugin_sandbox_scrape( $plugin ) {
} //Endif verify-delete
$delete_result = delete_plugins($plugins);

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("plugins.php?deleted=true&plugin_status=$status&paged=$page&s=$s");
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( admin_url("plugins.php?deleted=true&plugin_status=$status&paged=$page&s=$s") );
exit;
break;
case 'clear-recent-list':
Expand Down

0 comments on commit bcc3bb2

Please sign in to comment.