Make WordPress Core


Ignore:
Timestamp:
09/04/2012 02:38:37 AM (12 years ago)
Author:
nacin
Message:

Don't include functions.php in wp_load_translations_early()
to avoid a parse error in a PHP4 environment (caused by use of
the clone keyword in option.php).

Manually include functions.php in the rare situations where it
is not already included by the time we need to load translations
early.

Remove the functions.php dependency by switching the wp_die() calls
to die(), in wp_check_php_mysql_versions().

props SergeyBiryukov, see #21316, for trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/setup-config.php

    r20661 r21715  
    4545require(ABSPATH . WPINC . '/version.php');
    4646
    47 // Also loads functions.php, plugin.php, l10n.php, pomo/mo.php (all required by setup-config.php)
    48 wp_load_translations_early();
    49 
    5047// Check for the required PHP version and for the MySQL extension or a database drop-in.
    5148wp_check_php_mysql_versions();
     49
     50require_once(ABSPATH . WPINC . '/functions.php');
     51
     52// Also loads plugin.php, l10n.php, pomo/mo.php (all required by setup-config.php)
     53wp_load_translations_early();
    5254
    5355// Turn register_globals off.
Note: See TracChangeset for help on using the changeset viewer.