WordPress.org

Make WordPress Core

Changeset 13063


Ignore:
Timestamp:
02/12/10 07:56:28 (4 years ago)
Author:
westi
Message:

Improve the implementation of the default constant defining functions. See #11881.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-settings.php

    r12930 r13063  
    2222 
    2323// Set initial default constants including WP_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE. 
    24 wp_default_constants( 'init' ); 
     24wp_initial_constants( ); 
    2525 
    2626// Disable magic quotes at runtime. Magic quotes are added using wpdb later in wp-settings.php. 
     
    134134// Define constants that rely on the API to obtain the default value. 
    135135// Define must-use plugin directory constants, which may be overridden in the sunrise.php drop-in. 
    136 wp_default_constants( 'wp_included' ); 
     136wp_plugin_directory_constants( ); 
    137137 
    138138// Load must-use plugins. 
     
    155155 
    156156// Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies(). 
    157 wp_default_constants( 'ms_loaded' ); 
     157wp_cookie_constants( ); 
     158 
     159// Define and enforce our SSL constants 
     160wp_ssl_constants( ); 
    158161 
    159162// Create common globals. 
     
    181184do_action( 'plugins_loaded' ); 
    182185 
    183 // Define WP_POST_REVISIONS if not already defined. 
    184 wp_default_constants( 'plugins_loaded' ); 
     186// Define constants which affect functionality if not already defined. 
     187wp_functionality_constants( ); 
    185188 
    186189// Add magic quotes and set up $_REQUEST ( $_GET + $_POST ) 
     
    227230do_action( 'setup_theme' ); 
    228231 
    229 // Define the TEMPLATEPATH and STYLESHEETPATH constants. 
    230 wp_default_constants( 'setup_theme' ); 
     232// Define the template related constants. 
     233wp_templating_constants( ); 
    231234 
    232235// Load the default text localization domain. 
Note: See TracChangeset for help on using the changeset viewer.