WordPress.org

Make WordPress Core

Ticket #11637: 11637.2.diff

File 11637.2.diff, 2.3 KB (added by nacin, 8 years ago)

Updated against trunk r12933 (changes to wp-settings.php were handled in #11881)

  • wp-admin/setup-config.php

     
    3838require_once(ABSPATH . WPINC . '/compat.php');
    3939require_once(ABSPATH . WPINC . '/functions.php');
    4040require_once(ABSPATH . WPINC . '/classes.php');
     41require_once(ABSPATH . WPINC . '/version.php');
    4142
    4243if (!file_exists(ABSPATH . 'wp-config-sample.php'))
    4344        wp_die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');
     
    5253if (file_exists(ABSPATH . '../wp-config.php') && ! file_exists(ABSPATH . '../wp-settings.php'))
    5354        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>");
    5455
    55 if ( version_compare( '4.3', phpversion(), '>' ) )
    56         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() ) );
     56if ( version_compare( $required_php_version, phpversion(), '>' ) )
     57        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 ) );
    5758
    5859if ( !extension_loaded('mysql') && !file_exists(ABSPATH . 'wp-content/db.php') )
    5960        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*/ );
  • wp-includes/wp-db.php

     
    12181218        /**
    12191219         * Retrieve the name of the function that called wpdb.
    12201220         *
    1221          * Requires PHP 4.3 and searches up the list of functions until it reaches
     1221         * Searches up the list of functions until it reaches
    12221222         * the one that would most logically had called this method.
    12231223         *
    12241224         * @since 2.5.0
     
    12261226         * @return string The name of the calling function
    12271227         */
    12281228        function get_caller() {
    1229                 // requires PHP 4.3+
    1230                 if ( !is_callable('debug_backtrace') )
    1231                         return '';
    1232 
    12331229                $bt = debug_backtrace();
    12341230                $caller = array();
    12351231