Changeset 13064

Timestamp:

02/12/2010 07:59:11 AM (15 years ago)

Author:

westi

Message:

Improve function naming for plugin file discovery functions.

Location:

trunk

Files:

• wp-includes/load.php (modified) (2 diffs)
• wp-settings.php (modified) (2 diffs)

trunk/wp-includes/load.php

@@ -375 +375 @@
  * @return array Files to include
  */
-function wp_load_mu_plugins() {
+function wp_get_mu_plugins() {
     $mu_plugins = array();
     if ( !is_dir( WPMU_PLUGIN_DIR ) )
@@ -402 +402 @@
  * @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() );

trunk/wp-settings.php

@@ -137 +137 @@
 
 // Load must-use plugins.
-foreach ( wp_load_mu_plugins() as $mu_plugin ) {
+foreach ( wp_get_mu_plugins() as $mu_plugin ) {
     include_once( $mu_plugin );
 }
@@ -168 +168 @@
 
 // Load active plugins.
-foreach ( wp_load_plugins() as $plugin )
+foreach ( wp_get_active_and_valid_plugins() as $plugin )
     include_once( $plugin );
 unset( $plugin );