X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/6c8f14c09105d0afa4c1574215c59b5021040e76..refs/tags/wordpress-3.7:/wp-admin/install.php diff --git a/wp-admin/install.php b/wp-admin/install.php index 2ff4f172..0b6ac2ed 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -36,10 +36,10 @@ define( 'WP_INSTALLING', true ); require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); /** Load WordPress Administration Upgrade API */ -require_once( dirname( __FILE__ ) . '/includes/upgrade.php' ); +require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); /** Load wpdb */ -require_once(dirname(dirname(__FILE__)) . '/wp-includes/wp-db.php'); +require_once( ABSPATH . 'wp-includes/wp-db.php' ); $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; @@ -63,7 +63,7 @@ function display_header() { ?> -

+

-

ERROR: %s' ), $error ); ?>

+

@@ -100,7 +100,7 @@ function display_setup_form( $error = null ) { - +
username@example.com' ) ); + display_setup_form( __( 'Sorry, that isn’t a valid email address. Email addresses look like username@example.com.' ) ); $error = true; }