Wordpress 4.6

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

diff --git a/wp-settings.php b/wp-settings.php
index ef1d2cd66588ac8c1ad6a4ce4cde0e201e7f1c2d..dc3b25a7cb7b1486c9bc2f64ccad26876a866558 100644 (file)
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -20,13 +20,14 @@ 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' );

+require( ABSPATH . WPINC . '/plugin.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.
  */
 
 /*
  * 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;
+global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version, $wp_local_package;

 require( ABSPATH . WPINC . '/version.php' );
 
 /**
 require( ABSPATH . WPINC . '/version.php' );
 
 /**


@@ -69,9 +70,21 @@ timer_start();
 // Check if we're in WP_DEBUG mode.
 wp_debug_mode();
 
 // Check if we're in WP_DEBUG mode.
 wp_debug_mode();
 

+/**
+ * Filters whether to enable loading of the advanced-cache.php drop-in.
+ *
+ * This filter runs before it can be used by plugins. It is designed for non-web
+ * run-times. If false is returned, advanced-cache.php will never be loaded.
+ *
+ * @since 4.6.0
+ *
+ * @param bool $enable_advanced_cache Whether to enable loading advanced-cache.php (if present).
+ *                                    Default true.
+ */
+if ( WP_CACHE && apply_filters( 'enable_loading_advanced_cache_dropin', true ) ) {

 // For an advanced caching plugin to use. Uses a static drop-in because you would only want one.
 // For an advanced caching plugin to use. Uses a static drop-in because you would only want one.

-if ( WP_CACHE )

        WP_DEBUG ? include( WP_CONTENT_DIR . '/advanced-cache.php' ) : @include( WP_CONTENT_DIR . '/advanced-cache.php' );
        WP_DEBUG ? include( WP_CONTENT_DIR . '/advanced-cache.php' ) : @include( WP_CONTENT_DIR . '/advanced-cache.php' );

+}

 
 // Define WP_LANG_DIR if not set.
 wp_set_lang_dir();
 
 // Define WP_LANG_DIR if not set.
 wp_set_lang_dir();


@@ -81,10 +94,10 @@ require( ABSPATH . WPINC . '/compat.php' );
 require( ABSPATH . WPINC . '/functions.php' );
 require( ABSPATH . WPINC . '/class-wp.php' );
 require( ABSPATH . WPINC . '/class-wp-error.php' );
 require( ABSPATH . WPINC . '/functions.php' );
 require( ABSPATH . WPINC . '/class-wp.php' );
 require( ABSPATH . WPINC . '/class-wp-error.php' );

-require( ABSPATH . WPINC . '/plugin.php' );

 require( ABSPATH . WPINC . '/pomo/mo.php' );
 
 // Include the wpdb class and, if present, a db.php database drop-in.
 require( ABSPATH . WPINC . '/pomo/mo.php' );
 
 // Include the wpdb class and, if present, a db.php database drop-in.

+global $wpdb;

 require_wp_db();
 
 // Set the database table prefix and the format specifiers for database table columns.
 require_wp_db();
 
 // Set the database table prefix and the format specifiers for database table columns.


@@ -99,6 +112,8 @@ require( ABSPATH . WPINC . '/default-filters.php' );
 
 // Initialize multisite if enabled.
 if ( is_multisite() ) {
 
 // Initialize multisite if enabled.
 if ( is_multisite() ) {

+       require( ABSPATH . WPINC . '/class-wp-site-query.php' );
+       require( ABSPATH . WPINC . '/class-wp-network-query.php' );

        require( ABSPATH . WPINC . '/ms-blogs.php' );
        require( ABSPATH . WPINC . '/ms-settings.php' );
 } elseif ( ! defined( 'MULTISITE' ) ) {
        require( ABSPATH . WPINC . '/ms-blogs.php' );
        require( ABSPATH . WPINC . '/ms-settings.php' );
 } elseif ( ! defined( 'MULTISITE' ) ) {


@@ -135,12 +150,14 @@ require( ABSPATH . WPINC . '/class-wp-user-query.php' );
 require( ABSPATH . WPINC . '/session.php' );
 require( ABSPATH . WPINC . '/meta.php' );
 require( ABSPATH . WPINC . '/class-wp-meta-query.php' );
 require( ABSPATH . WPINC . '/session.php' );
 require( ABSPATH . WPINC . '/meta.php' );
 require( ABSPATH . WPINC . '/class-wp-meta-query.php' );

+require( ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php' );

 require( ABSPATH . WPINC . '/general-template.php' );
 require( ABSPATH . WPINC . '/link-template.php' );
 require( ABSPATH . WPINC . '/author-template.php' );
 require( ABSPATH . WPINC . '/post.php' );
 require( ABSPATH . WPINC . '/class-walker-page.php' );
 require( ABSPATH . WPINC . '/class-walker-page-dropdown.php' );
 require( ABSPATH . WPINC . '/general-template.php' );
 require( ABSPATH . WPINC . '/link-template.php' );
 require( ABSPATH . WPINC . '/author-template.php' );
 require( ABSPATH . WPINC . '/post.php' );
 require( ABSPATH . WPINC . '/class-walker-page.php' );
 require( ABSPATH . WPINC . '/class-walker-page-dropdown.php' );

+require( ABSPATH . WPINC . '/class-wp-post-type.php' );

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


@@ -166,6 +183,7 @@ require( ABSPATH . WPINC . '/deprecated.php' );
 require( ABSPATH . WPINC . '/script-loader.php' );
 require( ABSPATH . WPINC . '/taxonomy.php' );
 require( ABSPATH . WPINC . '/class-wp-term.php' );
 require( ABSPATH . WPINC . '/script-loader.php' );
 require( ABSPATH . WPINC . '/taxonomy.php' );
 require( ABSPATH . WPINC . '/class-wp-term.php' );

+require( ABSPATH . WPINC . '/class-wp-term-query.php' );

 require( ABSPATH . WPINC . '/class-wp-tax-query.php' );
 require( ABSPATH . WPINC . '/update.php' );
 require( ABSPATH . WPINC . '/canonical.php' );
 require( ABSPATH . WPINC . '/class-wp-tax-query.php' );
 require( ABSPATH . WPINC . '/update.php' );
 require( ABSPATH . WPINC . '/canonical.php' );


@@ -182,6 +200,7 @@ require( ABSPATH . WPINC . '/class-wp-http-proxy.php' );
 require( ABSPATH . WPINC . '/class-wp-http-cookie.php' );
 require( ABSPATH . WPINC . '/class-wp-http-encoding.php' );
 require( ABSPATH . WPINC . '/class-wp-http-response.php' );
 require( ABSPATH . WPINC . '/class-wp-http-cookie.php' );
 require( ABSPATH . WPINC . '/class-wp-http-encoding.php' );
 require( ABSPATH . WPINC . '/class-wp-http-response.php' );

+require( ABSPATH . WPINC . '/class-wp-http-requests-response.php' );

 require( ABSPATH . WPINC . '/widgets.php' );
 require( ABSPATH . WPINC . '/class-wp-widget.php' );
 require( ABSPATH . WPINC . '/class-wp-widget-factory.php' );
 require( ABSPATH . WPINC . '/widgets.php' );
 require( ABSPATH . WPINC . '/class-wp-widget.php' );
 require( ABSPATH . WPINC . '/class-wp-widget-factory.php' );


@@ -382,10 +401,10 @@ $GLOBALS['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
  * 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
+ * to load on the {@see '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.).
  *
  * 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.
+ * If you wish to plug an action once WP is loaded, use the {@see 'wp_loaded'} hook below.

  *
  * @since 1.5.0
  */
  *
  * @since 1.5.0
  */


@@ -403,7 +422,7 @@ if ( is_multisite() ) {
 /**
  * This hook is fired once WP, all plugins, and the theme are fully loaded and instantiated.
  *
 /**
  * This hook is fired once WP, all plugins, and the theme are fully loaded and instantiated.
  *

- * AJAX requests should use wp-admin/admin-ajax.php. admin-ajax.php can handle requests for
+ * Ajax requests should use wp-admin/admin-ajax.php. admin-ajax.php can handle requests for

  * users not logged in.
  *
  * @link https://codex.wordpress.org/AJAX_in_Plugins
  * users not logged in.
  *
  * @link https://codex.wordpress.org/AJAX_in_Plugins