WordPress 3.4.2

[autoinstalls/wordpress.git] / wp-includes / load.php

diff --git a/wp-includes/load.php b/wp-includes/load.php
index 94e6339d279df70097d26030e9c41e7797525b45..7e0262034fd18563504ea0dc8a9de17e0adc88d6 100644 (file)
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -105,12 +105,12 @@ function wp_check_php_mysql_versions() {
        $php_version = phpversion();
        if ( version_compare( $required_php_version, $php_version, '>' ) ) {
                wp_load_translations_early();
-               wp_die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
+               die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
        }
 
        if ( ! extension_loaded( 'mysql' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
                wp_load_translations_early();
-               wp_die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );
+               die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );
        }
 }
 
@@ -685,7 +685,6 @@ function wp_load_translations_early() {
        require_once ABSPATH . WPINC . '/locale.php';
 
        // General libraries
-       require_once ABSPATH . WPINC . '/functions.php';
        require_once ABSPATH . WPINC . '/plugin.php';
 
        $locales = $locations = array();