Index: wp-admin/install.php
===================================================================
--- wp-admin/install.php	(revision 19719)
+++ wp-admin/install.php	(working copy)
@@ -39,9 +39,9 @@
 require_once( dirname( __FILE__ ) . '/includes/upgrade.php' );
 
 /** Load wpdb */
-require_once(dirname(dirname(__FILE__)) . '/wp-includes/wp-db.php');
+require_once( dirname( dirname( __FILE__ ) ) . '/wp-includes/wp-db.php' );
 
-$step = isset( $_GET['step'] ) ? $_GET['step'] : 0;
+$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
 
 /**
  * Display install header.
@@ -183,19 +183,19 @@
 		display_header();
 		// Fill in the data we gathered
 		$weblog_title = isset( $_POST['weblog_title'] ) ? trim( stripslashes( $_POST['weblog_title'] ) ) : '';
-		$user_name = isset($_POST['user_name']) ? trim( stripslashes( $_POST['user_name'] ) ) : 'admin';
-		$admin_password = isset($_POST['admin_password']) ? $_POST['admin_password'] : '';
-		$admin_password_check = isset($_POST['admin_password2']) ? $_POST['admin_password2'] : '';
-		$admin_email  = isset( $_POST['admin_email']  ) ?trim( stripslashes( $_POST['admin_email'] ) ) : '';
-		$public       = isset( $_POST['blog_public']  ) ? (int) $_POST['blog_public'] : 0;
+		$user_name = isset( $_POST['user_name'] ) ? trim( stripslashes( $_POST['user_name'] ) ) : 'admin';
+		$admin_password = isset( $_POST['admin_password'] ) ? $_POST['admin_password'] : '';
+		$admin_password_check = isset( $_POST['admin_password2'] ) ? $_POST['admin_password2'] : '';
+		$admin_email = isset( $_POST['admin_email'] ) ? trim( stripslashes( $_POST['admin_email'] ) ) : '';
+		$public = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
 		// check e-mail address
 		$error = false;
 		if ( empty( $user_name ) ) {
 			// TODO: poka-yoke
-			display_setup_form( __('you must provide a valid username.') );
+			display_setup_form( __( 'you must provide a valid username.' ) );
 			$error = true;
 		} elseif ( $user_name != sanitize_user( $user_name, true ) ) {
-			display_setup_form( __('the username you provided has invalid characters.') );
+			display_setup_form( __( 'the username you provided has invalid characters.' ) );
 			$error = true;
 		} elseif ( $admin_password != $admin_password_check ) {
 			// TODO: poka-yoke
Index: wp-admin/setup-config.php
===================================================================
--- wp-admin/setup-config.php	(revision 19719)
+++ wp-admin/setup-config.php	(working copy)
@@ -62,10 +62,7 @@
 if (file_exists(ABSPATH . '../wp-config.php') && ! file_exists(ABSPATH . '../wp-settings.php'))
 	wp_die("<p>The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>");
 
-if (isset($_GET['step']))
-	$step = $_GET['step'];
-else
-	$step = 0;
+$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
 
 /**
  * Display setup wp-config.php file header.