Changeset 21739 for branches/3.4/wp-includes/load.php

Timestamp:

09/04/2012 08:31:14 PM (13 years ago)

Author:

nacin

Message:

Ensure we are parseable by PHP4 until wp_check_php_mysql_versions() has a chance to run.

Merges [21715], [21716] to the 3.4 branch.
props SergeyBiryukov.
fixes #21316.

File:

• branches/3.4/wp-includes/load.php (modified) (2 diffs)

branches/3.4/wp-includes/load.php

@@ -106 +106 @@
     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.' ) );
     }
 }
@@ -686 +686 @@
 
     // General libraries
-    require_once ABSPATH . WPINC . '/functions.php';
     require_once ABSPATH . WPINC . '/plugin.php';