WordPress 3.8

[autoinstalls/wordpress.git] / wp-settings.php

diff --git a/wp-settings.php b/wp-settings.php
index 65485a841064227188f0325c5c748aed73d33ee1..40d3a61e1ab4098d7baaa43aa7a77451b6ad0000 100644 (file)
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -20,10 +20,17 @@ define( 'WPINC', 'wp-includes' );
 // Include files required for initialization.
 require( ABSPATH . WPINC . '/load.php' );
 require( ABSPATH . WPINC . '/default-constants.php' );
 // Include files required for initialization.
 require( ABSPATH . WPINC . '/load.php' );
 require( ABSPATH . WPINC . '/default-constants.php' );

+
+/*
+ * These can't be directly globalized in version.php. When updating,
+ * we're including version.php from another install and don't want
+ * these values to be overridden if already set.
+ */
+global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version;

 require( ABSPATH . WPINC . '/version.php' );
 
 // Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE.
 require( ABSPATH . WPINC . '/version.php' );
 
 // Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE.

-wp_initial_constants( );
+wp_initial_constants();

 
 // Check for the required PHP version and for the MySQL extension or a database drop-in.
 wp_check_php_mysql_versions();
 
 // Check for the required PHP version and for the MySQL extension or a database drop-in.
 wp_check_php_mysql_versions();


@@ -107,6 +114,7 @@ require( ABSPATH . WPINC . '/class-wp-ajax-response.php' );
 require( ABSPATH . WPINC . '/formatting.php' );
 require( ABSPATH . WPINC . '/capabilities.php' );
 require( ABSPATH . WPINC . '/query.php' );
 require( ABSPATH . WPINC . '/formatting.php' );
 require( ABSPATH . WPINC . '/capabilities.php' );
 require( ABSPATH . WPINC . '/query.php' );

+require( ABSPATH . WPINC . '/date.php' );

 require( ABSPATH . WPINC . '/theme.php' );
 require( ABSPATH . WPINC . '/class-wp-theme.php' );
 require( ABSPATH . WPINC . '/template.php' );
 require( ABSPATH . WPINC . '/theme.php' );
 require( ABSPATH . WPINC . '/class-wp-theme.php' );
 require( ABSPATH . WPINC . '/template.php' );


@@ -117,6 +125,8 @@ require( ABSPATH . WPINC . '/link-template.php' );
 require( ABSPATH . WPINC . '/author-template.php' );
 require( ABSPATH . WPINC . '/post.php' );
 require( ABSPATH . WPINC . '/post-template.php' );
 require( ABSPATH . WPINC . '/author-template.php' );
 require( ABSPATH . WPINC . '/post.php' );
 require( ABSPATH . WPINC . '/post-template.php' );

+require( ABSPATH . WPINC . '/revision.php' );
+require( ABSPATH . WPINC . '/post-formats.php' );

 require( ABSPATH . WPINC . '/post-thumbnail-template.php' );
 require( ABSPATH . WPINC . '/category.php' );
 require( ABSPATH . WPINC . '/category-template.php' );
 require( ABSPATH . WPINC . '/post-thumbnail-template.php' );
 require( ABSPATH . WPINC . '/category.php' );
 require( ABSPATH . WPINC . '/category-template.php' );


@@ -152,7 +162,7 @@ if ( is_multisite() ) {
 
 // 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.
 
 // 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_plugin_directory_constants( );
+wp_plugin_directory_constants();

 
 // Load must-use plugins.
 foreach ( wp_get_mu_plugins() as $mu_plugin ) {
 
 // Load must-use plugins.
 foreach ( wp_get_mu_plugins() as $mu_plugin ) {


@@ -168,16 +178,21 @@ if ( is_multisite() ) {
        unset( $network_plugin );
 }
 
        unset( $network_plugin );
 }
 

+/**
+ * Fires once all must-use and network-activated plugins have loaded.
+ *
+ * @since 2.8.0
+ */

 do_action( 'muplugins_loaded' );
 
 if ( is_multisite() )
        ms_cookie_constants(  );
 
 // Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().
 do_action( 'muplugins_loaded' );
 
 if ( is_multisite() )
        ms_cookie_constants(  );
 
 // Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().

-wp_cookie_constants( );
+wp_cookie_constants();

 
 // Define and enforce our SSL constants
 
 // Define and enforce our SSL constants

-wp_ssl_constants( );
+wp_ssl_constants();

 
 // Create common globals.
 require( ABSPATH . WPINC . '/vars.php' );
 
 // Create common globals.
 require( ABSPATH . WPINC . '/vars.php' );


@@ -206,14 +221,26 @@ wp_set_internal_encoding();
 if ( WP_CACHE && function_exists( 'wp_cache_postload' ) )
        wp_cache_postload();
 
 if ( WP_CACHE && function_exists( 'wp_cache_postload' ) )
        wp_cache_postload();
 

+/**
+ * Fires once activated plugins have loaded.
+ *
+ * Pluggable functions are also available at this point in the loading order.
+ *
+ * @since 1.5.0
+ */

 do_action( 'plugins_loaded' );
 
 // Define constants which affect functionality if not already defined.
 do_action( 'plugins_loaded' );
 
 // Define constants which affect functionality if not already defined.

-wp_functionality_constants( );
+wp_functionality_constants();

 
 // Add magic quotes and set up $_REQUEST ( $_GET + $_POST )
 wp_magic_quotes();
 
 
 // Add magic quotes and set up $_REQUEST ( $_GET + $_POST )
 wp_magic_quotes();
 

+/**
+ * Fires when comment cookies are sanitized.
+ *
+ * @since 2.0.11
+ */

 do_action( 'sanitize_comment_cookies' );
 
 /**
 do_action( 'sanitize_comment_cookies' );
 
 /**


@@ -259,6 +286,11 @@ $GLOBALS['wp_widget_factory'] = new WP_Widget_Factory();
  */
 $GLOBALS['wp_roles'] = new WP_Roles();
 
  */
 $GLOBALS['wp_roles'] = new WP_Roles();
 

+/**
+ * Fires before the theme is loaded.
+ *
+ * @since 2.6.0
+ */

 do_action( 'setup_theme' );
 
 // Define the template related constants.
 do_action( 'setup_theme' );
 
 // Define the template related constants.


@@ -291,17 +323,26 @@ if ( ! defined( 'WP_INSTALLING' ) || 'wp-activate.php' === $pagenow ) {
                include( TEMPLATEPATH . '/functions.php' );
 }
 
                include( TEMPLATEPATH . '/functions.php' );
 }
 

+/**
+ * Fires after the theme is loaded.
+ *
+ * @since 3.0.0
+ */

 do_action( 'after_setup_theme' );
 
 // Set up current user.
 $wp->init();
 
 /**
 do_action( 'after_setup_theme' );
 
 // Set up current user.
 $wp->init();
 
 /**

+ * Fires after WordPress has finished loading but before any headers are sent.
+ *

  * Most of WP is loaded at this stage, and the user is authenticated. WP continues
  * to load on the init hook that follows (e.g. widgets), and many plugins instantiate
  * themselves on it for all sorts of reasons (e.g. they need a user, a taxonomy, etc.).
  *
  * If you wish to plug an action once WP is loaded, use the wp_loaded hook below.
  * Most of WP is loaded at this stage, and the user is authenticated. WP continues
  * to load on the init hook that follows (e.g. widgets), and many plugins instantiate
  * themselves on it for all sorts of reasons (e.g. they need a user, a taxonomy, etc.).
  *
  * If you wish to plug an action once WP is loaded, use the wp_loaded hook below.

+ *
+ * @since 1.5.0

  */
 do_action( 'init' );
 
  */
 do_action( 'init' );
 


@@ -324,4 +365,4 @@ if ( is_multisite() ) {
  *
  * @since 3.0.0
  */
  *
  * @since 3.0.0
  */

-do_action('wp_loaded');
+do_action( 'wp_loaded' );