Changes in trunk/wp-settings.php [14345:16558]

File:

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

trunk/wp-settings.php

@@ -36 +36 @@
 
 // Ensure these global variables do not exist so they do not interfere with WordPress.
-unset( $wp_filter, $cache_lastcommentmodified, $cache_lastpostdate );
+unset( $wp_filter, $cache_lastcommentmodified );
 
 // Standardize $_SERVER variables across setups.
@@ -66 +66 @@
 require( ABSPATH . WPINC . '/compat.php' );
 require( ABSPATH . WPINC . '/functions.php' );
-require( ABSPATH . WPINC . '/classes.php' );
-
-// Include the wpdb class, or a db.php database drop-in if present.
+require( ABSPATH . WPINC . '/class-wp.php' );
+require( ABSPATH . WPINC . '/class-wp-error.php' );
+require( ABSPATH . WPINC . '/plugin.php' );
+
+// Include the wpdb class and, if present, a db.php database drop-in.
 require_wp_db();
 
@@ -78 +80 @@
 
 // Load early WordPress files.
-require( ABSPATH . WPINC . '/plugin.php' );
 require( ABSPATH . WPINC . '/default-filters.php' );
 require( ABSPATH . WPINC . '/pomo/mo.php' );
@@ -101 +102 @@
 
 // Load most of WordPress.
+require( ABSPATH . WPINC . '/class-wp-walker.php' );
+require( ABSPATH . WPINC . '/class-wp-ajax-response.php' );
 require( ABSPATH . WPINC . '/formatting.php' );
 require( ABSPATH . WPINC . '/capabilities.php' );
@@ -134 +137 @@
 require( ABSPATH . WPINC . '/nav-menu.php' );
 require( ABSPATH . WPINC . '/nav-menu-template.php' );
+require( ABSPATH . WPINC . '/admin-bar.php' );
 
 // Load multisite-specific files.
@@ -152 +156 @@
 unset( $mu_plugin );
 
+// Load network activated plugins.
+if ( is_multisite() ) {
+    foreach( wp_get_active_network_plugins() as $network_plugin ) {
+        include_once( $network_plugin );
+    }
+    unset( $network_plugin );
+}
+
 do_action( 'muplugins_loaded' );
 
@@ -170 +182 @@
 create_initial_taxonomies();
 create_initial_post_types();
+
+// Register the default theme directory root
+register_theme_directory( get_theme_root() );
 
 // Load active plugins.