<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12930] trunk: Cleanup network plugin loading.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12930">12930</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-02 21:41:17 +0000 (Tue, 02 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup network plugin loading. Props nacin. see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (12929 => 12930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-02-02 18:05:01 UTC (rev 12929)
+++ trunk/wp-admin/includes/plugin.php 2010-02-02 21:41:17 UTC (rev 12930)
</span><span class="lines">@@ -544,23 +544,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * validate active plugins
</del><ins>+ * Validate active plugins
</ins><span class="cx"> *
</span><del>- * validate all active plugins, deactivates invalid and
- * returns an array of deactived ones.
</del><ins>+ * Validate all active plugins, deactivates invalid and
+ * returns an array of deactivated ones.
</ins><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> * @return array invalid plugins, plugin as key, error as value
</span><span class="cx"> */
</span><span class="cx"> function validate_active_plugins() {
</span><span class="cx"> $plugins = apply_filters( 'active_plugins', get_option( 'active_plugins', array() ) );
</span><del>-
</del><span class="cx"> // validate vartype: array
</span><del>- if ( !is_array( $plugins ) ) {
- update_option('active_plugins', array());
- return;
</del><ins>+ if ( ! is_array( $plugins ) ) {
+ update_option( 'active_plugins', array() );
+ $plugins = array();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( is_multisite() && is_super_admin() ) {
+ $network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
+ $plugins = array_merge( (array) $plugins, $network_plugins );
+ }
+
+ if ( empty( $plugins ) )
+ return;
+
</ins><span class="cx"> $invalid = array();
</span><span class="cx">
</span><span class="cx"> // invalid plugins get deactivated
</span><span class="lines">@@ -659,13 +666,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add a top level menu page
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -706,13 +713,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add a top level menu page in the 'objects' section
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -730,13 +737,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add a top level menu page in the 'utility' section
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -754,13 +761,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add a sub menu page
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $parent_slug The slug name for the parent menu (or the file name of a standard WordPress admin page)
</span><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="lines">@@ -813,13 +820,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the tools main menu.
</span><del>-*
</del><ins>+*
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -832,13 +839,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the options main menu.
</span><del>-*
</del><ins>+*
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -851,13 +858,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the themes main menu.
</span><del>-*
</del><ins>+*
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -870,13 +877,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the Users/Profile main menu.
</span><del>-*
</del><ins>+*
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -892,13 +899,13 @@
</span><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the Dashboard main menu.
</span><del>-*
</del><ins>+*
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -911,13 +918,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the posts main menu.
</span><del>-*
</del><ins>+*
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -930,13 +937,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the media main menu.
</span><del>-*
</del><ins>+*
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -949,13 +956,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the links main menu.
</span><del>-*
</del><ins>+*
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -968,13 +975,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the pages main menu.
</span><del>-*
</del><ins>+*
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span><span class="lines">@@ -987,13 +994,13 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add sub menu page to the comments main menu.
</span><del>-*
</del><ins>+*
</ins><span class="cx"> * This function takes a capability which will be used to determine whether
</span><span class="cx"> * or not a page is included in the menu.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The function which is hooked in to handle the output of the page must check
</span><span class="cx"> * that the user has the required capability as well.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
</span><span class="cx"> * @param string $menu_title The text to be used for the menu
</span><span class="cx"> * @param string $capability The capability required for this menu to be displayed to the user.
</span></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (12929 => 12930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2010-02-02 18:05:01 UTC (rev 12929)
+++ trunk/wp-includes/load.php 2010-02-02 21:41:17 UTC (rev 12930)
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @return array Files to include
</span><span class="cx"> */
</span><del>-function wp_muplugins_to_load() {
</del><ins>+function wp_load_mu_plugins() {
</ins><span class="cx"> $mu_plugins = array();
</span><span class="cx"> if ( !is_dir( WPMU_PLUGIN_DIR ) )
</span><span class="cx"> return $mu_plugins;
</span><span class="lines">@@ -401,22 +401,32 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @return array Files to include
</span><span class="cx"> */
</span><del>-function wp_plugins_to_load() {
</del><ins>+function wp_load_plugins() {
</ins><span class="cx"> $plugins = array();
</span><span class="cx">
</span><span class="cx"> // Check for hacks file if the option is enabled
</span><span class="cx"> if ( get_option( 'hack_file' ) && file_exists( ABSPATH . 'my-hacks.php' ) )
</span><span class="cx"> $plugins[] = ABSPATH . 'my-hacks.php';
</span><span class="cx">
</span><del>- $active_plugins = apply_filters( 'active_plugins', get_option( 'active_plugins', array() ) );
- if ( !is_array( $active_plugins ) || defined( 'WP_INSTALLING' ) )
</del><ins>+ $active_plugins = (array) apply_filters( 'active_plugins', get_option( 'active_plugins', array() ) );
+
+ // Get active network plugins
+ if ( is_multisite() ) {
+ $active_sitewide_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
+ if ( !empty($active_sitewide_plugins) ) {
+ $active_plugins = array_merge( $active_plugins, array_keys( $active_sitewide_plugins ) );
+ sort( $active_plugins );
+ }
+ }
+
+ if ( empty( $active_plugins ) || defined( 'WP_INSTALLING' ) )
</ins><span class="cx"> return $plugins;
</span><ins>+
</ins><span class="cx"> foreach ( $active_plugins as $plugin ) {
</span><del>- if ( validate_file( $plugin ) // $plugin must validate as file
- || '.php' != substr( $plugin, -4 ) // $plugin must end with '.php'
- || !file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
</del><ins>+ if ( ! validate_file( $plugin ) // $plugin must validate as file
+ && '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
+ && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
</ins><span class="cx"> )
</span><del>- continue;
</del><span class="cx"> $plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
</span><span class="cx"> }
</span><span class="cx"> return $plugins;
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12929 => 12930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-02-02 18:05:01 UTC (rev 12929)
+++ trunk/wp-includes/ms-functions.php 2010-02-02 21:41:17 UTC (rev 12930)
</span><span class="lines">@@ -1932,19 +1932,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
</span><span class="cx">
</span><del>-function mu_filter_plugins_list( $active_plugins ) {
- $active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
-
- if ( !$active_sitewide_plugins )
- return $active_plugins;
-
- $plugins = array_merge( (array) $active_plugins, array_keys( (array) $active_sitewide_plugins ) );
- sort( $plugins );
- return $plugins;
-}
-add_filter( 'active_plugins', 'mu_filter_plugins_list' );
-
- /**
</del><ins>+/**
</ins><span class="cx"> * Whether to force SSL on content.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8.5
</span></span></pre></div>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (12929 => 12930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-02-02 18:05:01 UTC (rev 12929)
+++ trunk/wp-includes/ms-load.php 2010-02-02 21:41:17 UTC (rev 12930)
</span><span class="lines">@@ -23,43 +23,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Returns array of sitewide plugin files to be included in global scope.
- *
- * @access private
- * @since 3.0.0
- * @return array Files to include
- */
-function ms_network_plugins() {
- $network_plugins = array();
- $deleted_sitewide_plugins = array();
- $wpmu_sitewide_plugins = (array) maybe_unserialize( get_site_option( 'wpmu_sitewide_plugins' ) );
- foreach ( $wpmu_sitewide_plugins as $plugin_file => $activation_time ) {
- if ( !$plugin_file )
- continue;
-
- if ( !file_exists( WP_PLUGIN_DIR . '/' . $plugin_file ) )
- $deleted_sitewide_plugins[] = $plugin_file;
- else
- $network_plugins[] = WP_PLUGIN_DIR . '/' . $plugin_file;
- }
-
- if ( !empty( $deleted_sitewide_plugins ) ) {
- $active_sitewide_plugins = maybe_unserialize( get_site_option( 'active_sitewide_plugins' ) );
-
- /* Remove any deleted plugins from the wpmu_sitewide_plugins array */
- foreach ( $deleted_sitewide_plugins as $plugin_file ) {
- unset( $wpmu_sitewide_plugins[$plugin_file] );
- unset( $active_sitewide_plugins[$plugin_file] );
- }
-
- update_site_option( 'wpmu_sitewide_plugins', $wpmu_sitewide_plugins );
- update_site_option( 'active_sitewide_plugins', $wpmu_sitewide_plugins );
- }
-
- return $network_plugins;
-}
-
-/**
</del><span class="cx"> * Checks status of current blog.
</span><span class="cx"> *
</span><span class="cx"> * Checks if the blog is deleted, inactive, archived, or spammed.
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (12929 => 12930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-02-02 18:05:01 UTC (rev 12929)
+++ trunk/wp-settings.php 2010-02-02 21:41:17 UTC (rev 12930)
</span><span class="lines">@@ -136,17 +136,11 @@
</span><span class="cx"> wp_default_constants( 'wp_included' );
</span><span class="cx">
</span><span class="cx"> // Load must-use plugins.
</span><del>-foreach( wp_muplugins_to_load() as $mu_plugin )
</del><ins>+foreach ( wp_load_mu_plugins() as $mu_plugin ) {
</ins><span class="cx"> include_once( $mu_plugin );
</span><ins>+}
</ins><span class="cx"> unset( $mu_plugin );
</span><span class="cx">
</span><del>-// Load network-wide plugins if multisite.
-if ( is_multisite() ) {
- foreach ( ms_network_plugins() as $plugin_file )
- include_once( $plugin_file );
- unset( $plugin_file );
-}
-
</del><span class="cx"> do_action( 'muplugins_loaded' );
</span><span class="cx">
</span><span class="cx"> // Check site status if multisite.
</span><span class="lines">@@ -170,7 +164,7 @@
</span><span class="cx"> create_initial_taxonomies();
</span><span class="cx">
</span><span class="cx"> // Load active plugins.
</span><del>-foreach( wp_plugins_to_load() as $plugin )
</del><ins>+foreach ( wp_load_plugins() as $plugin )
</ins><span class="cx"> include_once( $plugin );
</span><span class="cx"> unset( $plugin );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>