From 0206ffe69cf969810f44cb3958ba0f4db1e0a6e5 Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 12 Feb 2010 07:59:11 +0000
Subject: [PATCH] Improve function naming for plugin file discovery functions.

git-svn-id: http://svn.automattic.com/wordpress/trunk@13064 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/load.php | 4 ++--
 wp-settings.php      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-includes/load.php b/wp-includes/load.php
index c3d27961a0..fb5a249120 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.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() );
 
diff --git a/wp-settings.php b/wp-settings.php
index 614ef83200..f22881710a 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -136,7 +136,7 @@ if ( is_multisite() ) {
 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 @@ require( ABSPATH . WPINC . '/vars.php' );
 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 );