Permalink
Browse files

Improve function naming for plugin file discovery functions.

git-svn-id: http://svn.automattic.com/wordpress/trunk@13064 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 60dc67e commit 0206ffe69cf969810f44cb3958ba0f4db1e0a6e5 westi committed Feb 12, 2010
Showing with 4 additions and 4 deletions.
  1. +2 −2 wp-includes/load.php
  2. +2 −2 wp-settings.php
@@ -374,7 +374,7 @@ function wp_not_installed() {
* @since 3.0.0
* @return array Files to include
*/
-function wp_load_mu_plugins() {
+function wp_get_mu_plugins() {
$mu_plugins = array();
if ( !is_dir( WPMU_PLUGIN_DIR ) )
return $mu_plugins;
@@ -401,7 +401,7 @@ function wp_load_mu_plugins() {
* @since 3.0.0
* @return array Files to include
*/
-function wp_load_plugins() {
+function wp_get_active_and_valid_plugins() {
$plugins = array();
$active_plugins = (array) get_option( 'active_plugins', array() );
View
@@ -136,7 +136,7 @@
wp_plugin_directory_constants( );
// Load must-use plugins.
-foreach ( wp_load_mu_plugins() as $mu_plugin ) {
+foreach ( wp_get_mu_plugins() as $mu_plugin ) {
include_once( $mu_plugin );
}
unset( $mu_plugin );
@@ -167,7 +167,7 @@
create_initial_taxonomies();
// Load active plugins.
-foreach ( wp_load_plugins() as $plugin )
+foreach ( wp_get_active_and_valid_plugins() as $plugin )
include_once( $plugin );
unset( $plugin );

0 comments on commit 0206ffe

Please sign in to comment.