### Eclipse Workspace Patch 1.0
#P wordpress-trunk
Index: wp-admin/comment.php
===================================================================
--- wp-admin/comment.php	(revision 17521)
+++ wp-admin/comment.php	(working copy)
@@ -82,18 +82,18 @@
 	$comment_id = absint( $_GET['c'] );
 
 	if ( !$comment = get_comment_to_edit( $comment_id ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=1') );
+		wp_redirect( self_admin_url('edit-comments.php?error=1') );
 		die();
 	}
 
 	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=2') );
+		wp_redirect( self_admin_url('edit-comments.php?error=2') );
 		die();
 	}
 
 	// No need to re-approve/re-trash/re-spam a comment.
 	if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
+		wp_redirect( self_admin_url( 'edit-comments.php?same=' . $comment_id ) );
 		die();
  	}
 
Index: wp-admin/update-core.php
===================================================================
--- wp-admin/update-core.php	(revision 17521)
+++ wp-admin/update-core.php	(working copy)
@@ -444,7 +444,7 @@
 	} elseif ( isset( $_POST['checked'] ) ) {
 		$plugins = (array) $_POST['checked'];
 	} else {
-		wp_redirect( admin_url('update-core.php') );
+		wp_redirect( self_admin_url('update-core.php') );
 		exit;
 	}
 
@@ -472,7 +472,7 @@
 	} elseif ( isset( $_POST['checked'] ) ) {
 		$themes = (array) $_POST['checked'];
 	} else {
-		wp_redirect( admin_url('update-core.php') );
+		wp_redirect( self_admin_url('update-core.php') );
 		exit;
 	}
 
Index: wp-admin/themes.php
===================================================================
--- wp-admin/themes.php	(revision 17521)
+++ wp-admin/themes.php	(working copy)
@@ -18,14 +18,14 @@
 	if ( 'activate' == $_GET['action'] ) {
 		check_admin_referer('switch-theme_' . $_GET['template']);
 		switch_theme($_GET['template'], $_GET['stylesheet']);
-		wp_redirect( admin_url('themes.php?activated=true') );
+		wp_redirect( self_admin_url('themes.php?activated=true') );
 		exit;
 	} elseif ( 'delete' == $_GET['action'] ) {
 		check_admin_referer('delete-theme_' . $_GET['template']);
 		if ( !current_user_can('delete_themes') )
 			wp_die( __( 'Cheatin’ uh?' ) );
 		delete_theme($_GET['template']);
-		wp_redirect( admin_url('themes.php?deleted=true') );
+		wp_redirect( self_admin_url('themes.php?deleted=true') );
 		exit;
 	}
 }
Index: wp-admin/update.php
===================================================================
--- wp-admin/update.php	(revision 17521)
+++ wp-admin/update.php	(working copy)
@@ -70,9 +70,9 @@
 
 		check_admin_referer('activate-plugin_' . $plugin);
 		if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
-			wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
+			wp_redirect( self_admin_url('update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
 			activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ), true );
-			wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
+			wp_redirect( self_admin_url('update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
 			die();
 		}
 		iframe_header( __('Plugin Reactivation'), true );
Index: wp-admin/user/admin.php
===================================================================
--- wp-admin/user/admin.php	(revision 17521)
+++ wp-admin/user/admin.php	(working copy)
@@ -12,7 +12,7 @@
 require_once( dirname(dirname(__FILE__)) . '/admin.php');
 
 if ( ! is_multisite() ) {
-	wp_redirect( admin_url() );
+	wp_redirect( self_admin_url() );
 	exit;
 }
 
Index: wp-admin/media.php
===================================================================
--- wp-admin/media.php	(revision 17521)
+++ wp-admin/media.php	(working copy)
@@ -48,7 +48,7 @@
 		$errors = null;
 
 	if ( empty( $_GET['attachment_id'] ) ) {
-		wp_redirect( admin_url('upload.php') );
+		wp_redirect( self_admin_url('upload.php') );
 		exit();
 	}
 	$att_id = (int) $_GET['attachment_id'];
@@ -128,7 +128,7 @@
 	exit;
 
 default:
-	wp_redirect( admin_url('upload.php') );
+	wp_redirect( self_admin_url('upload.php') );
 	exit;
 
 endswitch;
Index: wp-admin/import.php
===================================================================
--- wp-admin/import.php	(revision 17521)
+++ wp-admin/import.php	(working copy)
@@ -37,7 +37,7 @@
 	);
 
 if ( ! empty( $_GET['invalid'] ) && !empty($popular_importers[$_GET['invalid']][3]) ) {
-	wp_redirect( admin_url('import.php?import=' . $popular_importers[$_GET['invalid']][3]) );
+	wp_redirect( self_admin_url('import.php?import=' . $popular_importers[$_GET['invalid']][3]) );
 	exit;
 }
 
Index: wp-admin/media-upload.php
===================================================================
--- wp-admin/media-upload.php	(revision 17521)
+++ wp-admin/media-upload.php	(working copy)
@@ -54,7 +54,7 @@
 		if ( $errors )
 			$location .= '?message=3';
 
-		wp_redirect( admin_url($location) );
+		wp_redirect( self_admin_url($location) );
 		exit;
 	}
 
Index: wp-admin/post.php
===================================================================
--- wp-admin/post.php	(revision 17521)
+++ wp-admin/post.php	(working copy)
@@ -139,7 +139,7 @@
 	$editing = true;
 
 	if ( empty( $post_id ) ) {
-		wp_redirect( admin_url('post.php') );
+		wp_redirect( self_admin_url('post.php') );
 		exit();
 	}
 
@@ -269,7 +269,7 @@
 	break;
 
 default:
-	wp_redirect( admin_url('edit.php') );
+	wp_redirect( self_admin_url('edit.php') );
 	exit();
 	break;
 } // end switch
Index: wp-admin/edit.php
===================================================================
--- wp-admin/edit.php	(revision 17521)
+++ wp-admin/edit.php	(working copy)
@@ -29,7 +29,7 @@
 // Back-compat for viewing comments of an entry
 foreach ( array( 'p', 'attachment_id', 'page_id' ) as $_redirect ) {
 	if ( ! empty( $_REQUEST[ $_redirect ] ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?p=' . absint( $_REQUEST[ $_redirect ] ) ) );
+		wp_redirect( self_admin_url( 'edit-comments.php?p=' . absint( $_REQUEST[ $_redirect ] ) ) );
 		exit;
 	}
 }
Index: wp-admin/network/edit.php
===================================================================
--- wp-admin/network/edit.php	(revision 17521)
+++ wp-admin/network/edit.php	(working copy)
@@ -14,7 +14,7 @@
 	wp_die( __( 'Multisite support is not enabled.' ) );
 
 if ( empty( $_GET['action'] ) ) {
-	wp_redirect( admin_url( 'index.php' ) );
+	wp_redirect( self_admin_url( 'index.php' ) );
 	exit;
 }
 
Index: wp-admin/moderation.php
===================================================================
--- wp-admin/moderation.php	(revision 17521)
+++ wp-admin/moderation.php	(working copy)
@@ -8,6 +8,6 @@
  * @subpackage Administration
  */
 require_once('../wp-load.php');
-wp_redirect( admin_url('edit-comments.php?comment_status=moderated') );
+wp_redirect( self_admin_url('edit-comments.php?comment_status=moderated') );
 exit;
 ?>
Index: wp-admin/options.php
===================================================================
--- wp-admin/options.php	(revision 17521)
+++ wp-admin/options.php	(working copy)
@@ -41,12 +41,12 @@
 			delete_option( 'new_admin_email' );
 			$redirect = 'options-general.php?updated=true';
 		}
-		wp_redirect( admin_url( $redirect ) );
+		wp_redirect( self_admin_url( $redirect ) );
 		exit;
 	} elseif ( ! empty( $_GET['dismiss'] ) && 'new_admin_email' == $_GET['dismiss'] ) {
 		delete_option( 'adminhash' );
 		delete_option( 'new_admin_email' );
-		wp_redirect( admin_url( 'options-general.php?updated=true' ) );
+		wp_redirect( self_admin_url( 'options-general.php?updated=true' ) );
 		exit;
 	}
 }
Index: wp-admin/admin.php
===================================================================
--- wp-admin/admin.php	(revision 17521)
+++ wp-admin/admin.php	(working copy)
@@ -41,7 +41,7 @@
 	do_action('after_db_upgrade');
 } elseif ( get_option('db_version') != $wp_db_version ) {
 	if ( !is_multisite() ) {
-		wp_redirect(admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))));
+		wp_redirect( self_admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))));
 		exit;
 	} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
 		/**
@@ -124,7 +124,7 @@
 				$query_string = $_SERVER[ 'QUERY_STRING' ];
 			else
 				$query_string = 'page=' . $plugin_page;
-			wp_redirect( admin_url('tools.php?' . $query_string) );
+			wp_redirect( self_admin_url('tools.php?' . $query_string) );
 			exit;
 		}
 	}
@@ -179,14 +179,14 @@
 		wp_die(__('You are not allowed to import.'));
 
 	if ( validate_file($importer) ) {
-		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
+		wp_redirect( self_admin_url( 'import.php?invalid=' . $importer ) );
 		exit;
 	}
 
 	// Allow plugins to define importers as well
 	if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) {
 		if (! file_exists(ABSPATH . "wp-admin/import/$importer.php")) {
-			wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
+			wp_redirect( self_admin_url( 'import.php?invalid=' . $importer ) );
 			exit;
 		}
 		include(ABSPATH . "wp-admin/import/$importer.php");
Index: wp-admin/widgets.php
===================================================================
--- wp-admin/widgets.php	(revision 17521)
+++ wp-admin/widgets.php	(working copy)
@@ -175,7 +175,7 @@
 	if ( isset($_POST['removewidget']) && $_POST['removewidget'] ) {
 
 		if ( !in_array($widget_id, $sidebar, true) ) {
-			wp_redirect( admin_url('widgets.php?error=0') );
+			wp_redirect( self_admin_url('widgets.php?error=0') );
 			exit;
 		}
 
@@ -208,7 +208,7 @@
 	}
 
 	wp_set_sidebars_widgets($sidebars_widgets);
-	wp_redirect( admin_url('widgets.php?message=0') );
+	wp_redirect( self_admin_url('widgets.php?message=0') );
 	exit;
 }