WordPress.org

Make WordPress Core

Changeset 13064


Ignore:
Timestamp:
02/12/10 07:59:11 (4 years ago)
Author:
westi
Message:

Improve function naming for plugin file discovery functions.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/load.php

    r12947 r13064  
    375375 * @return array Files to include 
    376376 */ 
    377 function wp_load_mu_plugins() { 
     377function wp_get_mu_plugins() { 
    378378    $mu_plugins = array(); 
    379379    if ( !is_dir( WPMU_PLUGIN_DIR ) ) 
     
    402402 * @return array Files to include 
    403403 */ 
    404 function wp_load_plugins() { 
     404function wp_get_active_and_valid_plugins() { 
    405405    $plugins = array(); 
    406406    $active_plugins = (array) get_option( 'active_plugins', array() ); 
  • trunk/wp-settings.php

    r13063 r13064  
    137137 
    138138// Load must-use plugins. 
    139 foreach ( wp_load_mu_plugins() as $mu_plugin ) { 
     139foreach ( wp_get_mu_plugins() as $mu_plugin ) { 
    140140    include_once( $mu_plugin ); 
    141141} 
     
    168168 
    169169// Load active plugins. 
    170 foreach ( wp_load_plugins() as $plugin ) 
     170foreach ( wp_get_active_and_valid_plugins() as $plugin ) 
    171171    include_once( $plugin ); 
    172172unset( $plugin ); 
Note: See TracChangeset for help on using the changeset viewer.