Changeset 18374

Timestamp:

06/29/2011 04:46:46 PM (14 years ago)

Author:

nacin

Message:

wp_check_php_mysql_versions() during setup and install. see #17934.

Location:

trunk

Files:

• wp-admin/setup-config.php (modified) (2 diffs)
• wp-includes/load.php (modified) (2 diffs)
• wp-load.php (modified) (1 diff)
• wp-settings.php (modified) (2 diffs)

trunk/wp-admin/setup-config.php

@@ -41 +41 @@
 
 require_once(ABSPATH . WPINC . '/load.php');
+require_once(ABSPATH . WPINC . '/version.php');
+wp_check_php_mysql_versions();
+
 require_once(ABSPATH . WPINC . '/compat.php');
 require_once(ABSPATH . WPINC . '/functions.php');
 require_once(ABSPATH . WPINC . '/class-wp-error.php');
-require_once(ABSPATH . WPINC . '/version.php');
 
 if (!file_exists(ABSPATH . 'wp-config-sample.php'))
@@ -58 +60 @@
 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 ( version_compare( $required_php_version, phpversion(), '>' ) )
-    wp_die( sprintf( /*WP_I18N_OLD_PHP*/'Your server is running PHP version %1$s but WordPress requires at least %2$s.'/*/WP_I18N_OLD_PHP*/, phpversion(), $required_php_version ) );
-
-if ( !extension_loaded('mysql') && !file_exists(ABSPATH . 'wp-content/db.php') )
-    wp_die( /*WP_I18N_OLD_MYSQL*/'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.'/*/WP_I18N_OLD_MYSQL*/ );
 
 if (isset($_GET['step']))

trunk/wp-includes/load.php

@@ -2 +2 @@
 /**
  * These functions are needed to load WordPress.
+ *
+ * This file must be parsable by PHP4.
  *
  * @package WordPress
@@ -95 +97 @@
  *
  * Dies if requirements are not met.
+ *
+ * This function must be able to work without a complete environment set up. In wp-load.php, for
+ * example, WP_CONTENT_DIR is defined and version.php is included before this function is called.
  *
  * @access private

trunk/wp-load.php

@@ -42 +42 @@
         $path = 'wp-admin/';
 
+    require_once( ABSPATH . '/wp-includes/load.php' );
+    require_once( ABSPATH . '/wp-includes/version.php' );
+    define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
+    wp_check_php_mysql_versions();
+
     // Die with an error message
     require_once( ABSPATH . '/wp-includes/class-wp-error.php' );

trunk/wp-settings.php

@@ -24 +24 @@
 wp_initial_constants( );
 
+// Check for the required PHP version and for the MySQL extension or a database drop-in.
+wp_check_php_mysql_versions();
+
 // Disable magic quotes at runtime. Magic quotes are added using wpdb later in wp-settings.php.
 set_magic_quotes_runtime( 0 );
@@ -40 +43 @@
 // Standardize $_SERVER variables across setups.
 wp_fix_server_vars();
-
-// Check for the required PHP version and for the MySQL extension or a database drop-in.
-wp_check_php_mysql_versions();
 
 // Check if we have received a request due to missing favicon.ico