WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve function naming for plugin file discovery functions. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13064 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2010-02-12 07:59:11 +00:00
parent 60dc67eb44
commit 0206ffe69c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/load.php
View File

@ -374,7 +374,7 @@ function wp_not_installed() {
* @since 3.0.0 * @since 3.0.0
* @return array Files to include * @return array Files to include
*/ */
function wp_load_mu_plugins() { function wp_get_mu_plugins() {
$mu_plugins = array(); $mu_plugins = array();
if ( !is_dir( WPMU_PLUGIN_DIR ) ) if ( !is_dir( WPMU_PLUGIN_DIR ) )
return $mu_plugins; return $mu_plugins;
@ -401,7 +401,7 @@ function wp_load_mu_plugins() {
* @since 3.0.0 * @since 3.0.0
* @return array Files to include * @return array Files to include
*/ */
function wp_load_plugins() { function wp_get_active_and_valid_plugins() {
$plugins = array(); $plugins = array();
$active_plugins = (array) get_option( 'active_plugins', array() ); $active_plugins = (array) get_option( 'active_plugins', array() );

4
wp-settings.php
View File

@ -136,7 +136,7 @@ if ( is_multisite() ) {
wp_plugin_directory_constants( ); wp_plugin_directory_constants( );
// Load must-use plugins. // Load must-use plugins.
foreach ( wp_load_mu_plugins() as $mu_plugin ) { foreach ( wp_get_mu_plugins() as $mu_plugin ) {
include_once( $mu_plugin ); include_once( $mu_plugin );
} }
unset( $mu_plugin ); unset( $mu_plugin );
@ -167,7 +167,7 @@ require( ABSPATH . WPINC . '/vars.php' );
create_initial_taxonomies(); create_initial_taxonomies();
// Load active plugins. // Load active plugins.
foreach ( wp_load_plugins() as $plugin ) foreach ( wp_get_active_and_valid_plugins() as $plugin )
include_once( $plugin ); include_once( $plugin );
unset( $plugin ); unset( $plugin );