### Eclipse Workspace Patch 1.0
#P wordpress-trunk bare
Index: wp-includes/canonical.php
===================================================================
--- wp-includes/canonical.php	(revision 17114)
+++ wp-includes/canonical.php	(working copy)
@@ -365,7 +365,7 @@
 		// protect against chained redirects
 		if ( !redirect_canonical($redirect_url, false) ) {
 			wp_redirect($redirect_url, 301);
-			exit();
+			exit;
 		} else {
 			// Debug
 			// die("1: $redirect_url<br />2: " . redirect_canonical( $redirect_url, false ) );
Index: wp-admin/includes/class-wp-importer.php
===================================================================
--- wp-admin/includes/class-wp-importer.php	(revision 17114)
+++ wp-admin/includes/class-wp-importer.php	(working copy)
@@ -126,14 +126,14 @@
 			$blog = 'http://' . preg_replace( '#^https?://#', '', $blog_id );
 			if ( ( !$parsed = parse_url( $blog ) ) || empty( $parsed['host'] ) ) {
 				fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" );
-				exit();
+				exit;
 			}
 			if ( empty( $parsed['path'] ) )
 				$parsed['path'] = '/';
 			$blog = get_blog_details( array( 'domain' => $parsed['host'], 'path' => $parsed['path'] ) );
 			if ( !$blog ) {
 				fwrite( STDERR, "Error: Could not find blog\n" );
-				exit();
+				exit;
 			}
 			$blog_id = (int) $blog->blog_id;
 			// Restore global $current_blog
@@ -158,7 +158,7 @@
 
 		if ( !$user_id || !wp_set_current_user( $user_id ) ) {
 			fwrite( STDERR, "Error: can not find user\n" );
-			exit();
+			exit;
 		}
 
 		return $user_id;
@@ -304,7 +304,7 @@
 	if ( !isset( $out[$param] ) && $required ) {
 		// Display message and exit
 		echo "\"$param\" parameter is required but was not specified\n";
-		exit();
+		exit;
 	}
 
 	return $return;
Index: wp-admin/admin.php
===================================================================
--- wp-admin/admin.php	(revision 17114)
+++ wp-admin/admin.php	(working copy)
@@ -170,7 +170,7 @@
 
 	include(ABSPATH . 'wp-admin/admin-footer.php');
 
-	exit();
+	exit;
 } else if (isset($_GET['import'])) {
 
 	$importer = $_GET['import'];
@@ -214,7 +214,7 @@
 	global $wp_rewrite;
 	$wp_rewrite->flush_rules(false);
 
-	exit();
+	exit;
 } else {
 	do_action("load-$pagenow");
 	// Backwards compatibility with old load-page-new.php, load-page.php,
Index: wp-admin/update-core.php
===================================================================
--- wp-admin/update-core.php	(revision 17114)
+++ wp-admin/update-core.php	(working copy)
@@ -11,7 +11,7 @@
 
 if ( is_multisite() && ! is_network_admin() ) {
 	wp_redirect( network_admin_url( 'update-core.php' ) );
-	exit();
+	exit;
 }
 
 if ( ! current_user_can( 'update_core' ) )
Index: wp-admin/media.php
===================================================================
--- wp-admin/media.php	(revision 17114)
+++ wp-admin/media.php	(working copy)
@@ -49,7 +49,7 @@
 
 	if ( empty( $_GET['attachment_id'] ) ) {
 		wp_redirect( admin_url('upload.php') );
-		exit();
+		exit;
 	}
 	$att_id = (int) $_GET['attachment_id'];
 
Index: wp-admin/comment.php
===================================================================
--- wp-admin/comment.php	(revision 17114)
+++ wp-admin/comment.php	(working copy)
@@ -275,7 +275,7 @@
 	$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
 	wp_redirect( $location );
 
-	exit();
+	exit;
 	break;
 
 default:
Index: wp-admin/network/site-users.php
===================================================================
--- wp-admin/network/site-users.php	(revision 17114)
+++ wp-admin/network/site-users.php	(working copy)
@@ -143,12 +143,12 @@
 	
 	restore_current_blog();
 	wp_redirect( add_query_arg( 'update', $update, wp_get_referer() ) );
-	exit();
+	exit;
 }
 
 if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
 	wp_redirect( wp_get_referer() );
-	exit();
+	exit;
 }
 
 add_screen_option( 'per_page', array( 'label' => _x( 'Users', 'users per page (screen options)' ) ) );
Index: wp-login.php
===================================================================
--- wp-login.php	(revision 17114)
+++ wp-login.php	(working copy)
@@ -15,10 +15,10 @@
 if ( force_ssl_admin() && !is_ssl() ) {
 	if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
 		wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));
-		exit();
+		exit;
 	} else {
 		wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-		exit();
+		exit;
 	}
 }
 
@@ -378,7 +378,7 @@
 
 	$redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?loggedout=true';
 	wp_safe_redirect( $redirect_to );
-	exit();
+	exit;
 
 break;
 
@@ -390,7 +390,7 @@
 		if ( !is_wp_error($errors) ) {
 			$redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?checkemail=confirm';
 			wp_safe_redirect( $redirect_to );
-			exit();
+			exit;
 		}
 	}
 
@@ -490,7 +490,7 @@
 
 	if ( !get_option('users_can_register') ) {
 		wp_redirect( site_url('wp-login.php?registration=disabled') );
-		exit();
+		exit;
 	}
 
 	$user_login = '';
@@ -502,7 +502,7 @@
 		if ( !is_wp_error($errors) ) {
 			$redirect_to = !empty( $_POST['redirect_to'] ) ? $_POST['redirect_to'] : 'wp-login.php?checkemail=registered';
 			wp_safe_redirect( $redirect_to );
-			exit();
+			exit;
 		}
 	}
 
@@ -591,7 +591,7 @@
 		elseif ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) )
 			$redirect_to = admin_url('profile.php');
 		wp_safe_redirect($redirect_to);
-		exit();
+		exit;
 	}
 
 	$errors = $user;
Index: wp-includes/pluggable.php
===================================================================
--- wp-includes/pluggable.php	(revision 17114)
+++ wp-includes/pluggable.php	(working copy)
@@ -768,10 +768,10 @@
 	if ( $secure && !is_ssl() && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) {
 		if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
 			wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));
-			exit();
+			exit;
 		} else {
 			wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-			exit();
+			exit;
 		}
 	}
 
@@ -787,10 +787,10 @@
 		if ( !$secure && get_user_option('use_ssl', $user_id) && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) {
 			if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
 				wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));
-				exit();
+				exit;
 			} else {
 				wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-				exit();
+				exit;
 			}
 		}
 
@@ -810,7 +810,7 @@
 	$login_url = wp_login_url($redirect, true);
 
 	wp_redirect($login_url);
-	exit();
+	exit;
 }
 endif;
 
Index: wp-admin/users.php
===================================================================
--- wp-admin/users.php	(revision 17114)
+++ wp-admin/users.php	(working copy)
@@ -50,7 +50,7 @@
 
 	if ( empty($_REQUEST['users']) ) {
 		wp_redirect($redirect);
-		exit();
+		exit;
 	}
 
 	$editable_roles = get_editable_roles();
@@ -79,7 +79,7 @@
 	}
 
 	wp_redirect(add_query_arg('update', $update, $redirect));
-	exit();
+	exit;
 
 break;
 
@@ -91,7 +91,7 @@
 
 	if ( empty($_REQUEST['users']) ) {
 		wp_redirect($redirect);
-		exit();
+		exit;
 	}
 
 	if ( ! current_user_can( 'delete_users' ) )
@@ -126,7 +126,7 @@
 
 	$redirect = add_query_arg( array('delete_count' => $delete_count, 'update' => $update), $redirect);
 	wp_redirect($redirect);
-	exit();
+	exit;
 
 break;
 
@@ -138,7 +138,7 @@
 
 	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
 		wp_redirect($redirect);
-		exit();
+		exit;
 	}
 
 	if ( ! current_user_can( 'delete_users' ) )
@@ -233,7 +233,7 @@
 
 	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
 		wp_redirect($redirect);
-		exit();
+		exit;
 	}
 
 	if ( !current_user_can('remove_users') )
Index: wp-admin/network/edit.php
===================================================================
--- wp-admin/network/edit.php	(revision 17114)
+++ wp-admin/network/edit.php	(working copy)
@@ -162,7 +162,7 @@
 		do_action( 'update_wpmu_options' );
 
 		wp_redirect( add_query_arg( 'updated', 'true', network_admin_url( 'settings.php' ) ) );
-		exit();
+		exit;
 	break;
 
 	case 'updateblog':
@@ -181,7 +181,7 @@
 			wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'not_deleted' ), wp_get_referer() ) );
 		}
 
-		exit();
+		exit;
 	break;
 
 	case 'allblogs':
@@ -226,7 +226,7 @@
 		} else {
 			wp_redirect( network_admin_url( 'sites.php' ) );
 		}
-		exit();
+		exit;
 	break;
 
 	case 'archiveblog':
@@ -236,7 +236,7 @@
 
 		update_blog_status( $id, 'archived', '1' );
 		wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'archive' ), wp_get_referer() ) );
-		exit();
+		exit;
 	break;
 
 	case 'unarchiveblog':
@@ -246,7 +246,7 @@
 
 		update_blog_status( $id, 'archived', '0' );
 		wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unarchive' ), wp_get_referer() ) );
-		exit();
+		exit;
 	break;
 
 	case 'activateblog':
@@ -257,7 +257,7 @@
 		update_blog_status( $id, 'deleted', '0' );
 		do_action( 'activate_blog', $id );
 		wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'activate' ), wp_get_referer() ) );
-		exit();
+		exit;
 	break;
 
 	case 'deactivateblog':
@@ -268,7 +268,7 @@
 		do_action( 'deactivate_blog', $id );
 		update_blog_status( $id, 'deleted', '1' );
 		wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'deactivate' ), wp_get_referer() ) );
-		exit();
+		exit;
 	break;
 
 	case 'unspamblog':
@@ -278,7 +278,7 @@
 
 		update_blog_status( $id, 'spam', '0' );
 		wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unspam' ), wp_get_referer() ) );
-		exit();
+		exit;
 	break;
 
 	case 'spamblog':
@@ -288,7 +288,7 @@
 
 		update_blog_status( $id, 'spam', '1' );
 		wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'spam' ), wp_get_referer() ) );
-		exit();
+		exit;
 	break;
 
 	case 'unmatureblog':
@@ -298,7 +298,7 @@
 
 		update_blog_status( $id, 'mature', '0' );
 		wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unmature' ), wp_get_referer() ) );
-		exit();
+		exit;
 	break;
 
 	case 'matureblog':
@@ -308,7 +308,7 @@
 
 		update_blog_status( $id, 'mature', '1' );
 		wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'mature' ), wp_get_referer() ) );
-		exit();
+		exit;
 	break;
 
 	// Common
@@ -345,7 +345,7 @@
 			</body>
 		</html>
 		<?php
-		exit();
+		exit;
 	break;
 
 	// Users
@@ -367,7 +367,7 @@
   		} else {
 			wp_redirect( network_admin_url( 'users.php' ) );
 		}
-		exit();
+		exit;
 	break;
 
 	case 'allusers':
@@ -393,7 +393,7 @@
 							confirm_delete_users( $_POST['allusers'] );
 							echo '</div>';
 				            require_once( '../admin-footer.php' );
-				            exit();
+				            exit;
        					break;
 
 						case 'spam':
@@ -426,7 +426,7 @@
 		} else {
 			wp_redirect( network_admin_url( 'users.php' ) );
 		}
-		exit();
+		exit;
 	break;
 
 	case 'dodelete':
@@ -462,14 +462,14 @@
 			$deletefunction = 'all_delete';
 
 		wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) );
-		exit();
+		exit;
 	break;
 
 	default:
 		// Let plugins use us as a post handler easily
 		do_action( 'network_admin_edit_' . $_GET['action'] );
 		wp_redirect( network_admin_url( 'index.php' ) );
-		exit();
+		exit;
 	break;
 }
 ?>
Index: wp-admin/theme-editor.php
===================================================================
--- wp-admin/theme-editor.php	(revision 17114)
+++ wp-admin/theme-editor.php	(working copy)
@@ -11,7 +11,7 @@
 
 if ( is_multisite() && ! is_network_admin() ) {
 	wp_redirect( network_admin_url( 'theme-editor.php' ) );
-	exit();
+	exit;
 }
 
 if ( !current_user_can('edit_themes') )
@@ -97,7 +97,7 @@
 	$strip = array('%0d', '%0a', '%0D', '%0A');
 	$location = _deep_replace($strip, $location);
 	header("Location: $location");
-	exit();
+	exit;
 
 break;
 
Index: wp-app.php
===================================================================
--- wp-app.php	(revision 17114)
+++ wp-app.php	(working copy)
@@ -300,7 +300,7 @@
 
 					array_shift($matches);
 					call_user_func_array(array(&$this,$funcs[$method]), $matches);
-					exit();
+					exit;
 				} else {
 					// only allow what we have handlers for...
 					$this->not_allowed(array_keys($funcs));
Index: wp-includes/ms-functions.php
===================================================================
--- wp-includes/ms-functions.php	(revision 17114)
+++ wp-includes/ms-functions.php	(working copy)
@@ -419,11 +419,11 @@
 	if ( $ref ) {
 		$ref = wpmu_admin_redirect_add_updated_param( $ref );
 		wp_redirect( $ref );
-		exit();
+		exit;
 	}
 	if ( empty( $_SERVER['HTTP_REFERER'] ) == false ) {
 		wp_redirect( $_SERVER['HTTP_REFERER'] );
-		exit();
+		exit;
 	}
 
 	$url = wpmu_admin_redirect_add_updated_param( $url );
@@ -434,7 +434,7 @@
 		$url = wpmu_admin_redirect_add_updated_param( $_POST['redirect'] );
 	}
 	wp_redirect( $url );
-	exit();
+	exit;
 }
 
 function wpmu_admin_redirect_add_updated_param( $url = '' ) {
@@ -1352,7 +1352,7 @@
 		if ( $destination == '%siteurl%' )
 			$destination = network_home_url();
 		wp_redirect( $destination );
-		exit();
+		exit;
 	}
 }
 
Index: wp-admin/plugin-install.php
===================================================================
--- wp-admin/plugin-install.php	(revision 17114)
+++ wp-admin/plugin-install.php	(working copy)
@@ -17,7 +17,7 @@
 
 if ( is_multisite() && ! is_network_admin() ) {
 	wp_redirect( network_admin_url( 'plugin-install.php' ) );
-	exit();
+	exit;
 }
 
 $wp_list_table = get_list_table('WP_Plugin_Install_List_Table');
Index: wp-admin/edit.php
===================================================================
--- wp-admin/edit.php	(revision 17114)
+++ wp-admin/edit.php	(working copy)
@@ -124,7 +124,7 @@
 	$sendback = remove_query_arg( array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status',  'post', 'bulk_edit', 'post_view'), $sendback );
 
 	wp_redirect($sendback);
-	exit();
+	exit;
 } elseif ( ! empty($_REQUEST['_wp_http_referer']) ) {
 	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) );
 	 exit;
Index: wp-admin/network/site-themes.php
===================================================================
--- wp-admin/network/site-themes.php	(revision 17114)
+++ wp-admin/network/site-themes.php	(working copy)
@@ -106,7 +106,7 @@
 
 if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
 	wp_redirect( wp_get_referer() );
-	exit();
+	exit;
 }
 
 add_thickbox();
Index: wp-admin/plugin-editor.php
===================================================================
--- wp-admin/plugin-editor.php	(revision 17114)
+++ wp-admin/plugin-editor.php	(working copy)
@@ -11,7 +11,7 @@
 
 if ( is_multisite() && ! is_network_admin() ) {
 	wp_redirect( network_admin_url( 'plugin-editor.php' ) );
-	exit();
+	exit;
 }
 
 if ( !current_user_can('edit_plugins') )
Index: wp-admin/post.php
===================================================================
--- wp-admin/post.php	(revision 17114)
+++ wp-admin/post.php	(working copy)
@@ -132,7 +132,7 @@
 	}
 
 	redirect_post($post_id);
-	exit();
+	exit;
 	break;
 
 case 'edit':
@@ -140,7 +140,7 @@
 
 	if ( empty( $post_id ) ) {
 		wp_redirect( admin_url('post.php') );
-		exit();
+		exit;
 	}
 
 	$p = $post_id;
@@ -205,7 +205,7 @@
 
 	redirect_post($post_id); // Send user on their way while we keep working
 
-	exit();
+	exit;
 	break;
 
 case 'trash':
@@ -220,7 +220,7 @@
 		wp_die( __('Error in moving to Trash.') );
 
 	wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
-	exit();
+	exit;
 	break;
 
 case 'untrash':
@@ -233,7 +233,7 @@
 		wp_die( __('Error in restoring from Trash.') );
 
 	wp_redirect( add_query_arg('untrashed', 1, $sendback) );
-	exit();
+	exit;
 	break;
 
 case 'delete':
@@ -253,7 +253,7 @@
 	}
 
 	wp_redirect( add_query_arg('deleted', 1, $sendback) );
-	exit();
+	exit;
 	break;
 
 case 'preview':
@@ -262,12 +262,12 @@
 	$url = post_preview();
 
 	wp_redirect($url);
-	exit();
+	exit;
 	break;
 
 default:
 	wp_redirect( admin_url('edit.php') );
-	exit();
+	exit;
 	break;
 } // end switch
 include('./admin-footer.php');
Index: wp-includes/class-wp.php
===================================================================
--- wp-includes/class-wp.php	(revision 17114)
+++ wp-includes/class-wp.php	(working copy)
@@ -371,7 +371,7 @@
 			@header("{$name}: {$field_value}");
 
 		if ( $exit_required )
-			exit();
+			exit;
 
 		do_action_ref_array('send_headers', array(&$this));
 	}
Index: wp-admin/theme-install.php
===================================================================
--- wp-admin/theme-install.php	(revision 17114)
+++ wp-admin/theme-install.php	(working copy)
@@ -17,7 +17,7 @@
 
 if ( is_multisite() && ! is_network_admin() ) {
 	wp_redirect( network_admin_url( 'theme-install.php' ) );
-	exit();
+	exit;
 }
 
 $wp_list_table = get_list_table('WP_Theme_Install_List_Table');