X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/80b7979fccf09a75af3f4c111fa27060ae6dbf85..88550bc3400cc7c035ff590ecb007c7938041ded:/wp-admin/install.php diff --git a/wp-admin/install.php b/wp-admin/install.php index e39d1f4f..93c9d72f 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -15,8 +15,8 @@ if ( false ) {
WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.
@@ -36,10 +36,15 @@ 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 WordPress Translation Install API */ +require_once( ABSPATH . 'wp-admin/includes/translation-install.php' ); /** Load wpdb */ -require_once(dirname(dirname(__FILE__)) . '/wp-includes/wp-db.php'); +require_once( ABSPATH . WPINC . '/wp-db.php' ); + +nocache_headers(); $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; @@ -47,21 +52,28 @@ $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0; * Display install header. * * @since 2.5.0 - * @package WordPress - * @subpackage Installer */ -function display_header() { +function display_header( $body_classes = '' ) { header( 'Content-Type: text/html; charset=utf-8' ); + if ( is_rtl() ) { + $body_classes .= 'rtl'; + } + if ( $body_classes ) { + $body_classes = ' ' . $body_classes; + } ?> > +' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '
' ); + die( '' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '
' ); } $php_version = phpversion(); @@ -167,13 +181,39 @@ if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) { die( '' . __( 'Your wp-config.php
file has an empty database table prefix, which is not supported.' ) . '