Changeset 12939

Timestamp:

02/03/2010 09:38:09 PM (15 years ago)

Author:

markjaquith

Message:

Use $required_php_version. Props nacin. fixes #11637

Location:

trunk

Files:

• wp-admin/setup-config.php (modified) (2 diffs)
• wp-includes/wp-db.php (modified) (2 diffs)

trunk/wp-admin/setup-config.php

@@ -39 +39 @@
 require_once(ABSPATH . WPINC . '/functions.php');
 require_once(ABSPATH . WPINC . '/classes.php');
+require_once(ABSPATH . WPINC . '/version.php');
 
 if (!file_exists(ABSPATH . 'wp-config-sample.php'))
@@ -53 +54 @@
     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( '4.3', phpversion(), '>' ) )
-    wp_die( sprintf( /*WP_I18N_OLD_PHP*/'Your server is running PHP version %s but WordPress requires at least 4.3.'/*/WP_I18N_OLD_PHP*/, phpversion() ) );
+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') )

trunk/wp-includes/wp-db.php

@@ -1219 +1219 @@
      * Retrieve the name of the function that called wpdb.
      *
-     * Requires PHP 4.3 and searches up the list of functions until it reaches
+     * Searches up the list of functions until it reaches
      * the one that would most logically had called this method.
      *
@@ -1227 +1227 @@
      */
     function get_caller() {
-        // requires PHP 4.3+
-        if ( !is_callable('debug_backtrace') )
-            return '';
-
         $bt = debug_backtrace();
         $caller = array();