Changeset 13063

Timestamp:

02/12/2010 07:56:28 AM (15 years ago)

Author:

westi

Message:

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

File:

• trunk/wp-settings.php (modified) (5 diffs)

trunk/wp-settings.php

@@ -22 +22 @@
 
 // Set initial default constants including WP_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE.
-wp_default_constants( 'init' );
+wp_initial_constants( );
 
 // Disable magic quotes at runtime. Magic quotes are added using wpdb later in wp-settings.php.
@@ -134 +134 @@
 // Define constants that rely on the API to obtain the default value.
 // Define must-use plugin directory constants, which may be overridden in the sunrise.php drop-in.
-wp_default_constants( 'wp_included' );
+wp_plugin_directory_constants( );
 
 // Load must-use plugins.
@@ -155 +155 @@
 
 // Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().
-wp_default_constants( 'ms_loaded' );
+wp_cookie_constants( );
+
+// Define and enforce our SSL constants
+wp_ssl_constants( );
 
 // Create common globals.
@@ -181 +184 @@
 do_action( 'plugins_loaded' );
 
-// Define WP_POST_REVISIONS if not already defined.
-wp_default_constants( 'plugins_loaded' );
+// Define constants which affect functionality if not already defined.
+wp_functionality_constants( );
 
 // Add magic quotes and set up $_REQUEST ( $_GET + $_POST )
@@ -227 +230 @@
 do_action( 'setup_theme' );
 
-// Define the TEMPLATEPATH and STYLESHEETPATH constants.
-wp_default_constants( 'setup_theme' );
+// Define the template related constants.
+wp_templating_constants(  );
 
 // Load the default text localization domain.