Make WordPress Core


Ignore:
Timestamp:
11/24/2010 12:19:38 AM (11 years ago)
Author:
ryan
Message:

Load network plugins for wp-activate.php. Restore MU load order. Props blamenacin. fixes #14718

File:
1 edited

Legend:

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

    r15968 r16558  
    473473    $active_plugins = (array) get_option( 'active_plugins', array() );
    474474
    475     // Get active network plugins
    476     if ( is_multisite() ) {
    477         $active_sitewide_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
    478         if ( !empty($active_sitewide_plugins) ) {
    479             $active_plugins = array_merge( $active_plugins, array_keys( $active_sitewide_plugins ) );
    480             sort( $active_plugins );
    481         }
    482     }
    483 
    484475    // Check for hacks file if the option is enabled
    485476    if ( get_option( 'hack_file' ) && file_exists( ABSPATH . 'my-hacks.php' ) ) {
     
    491482        return $plugins;
    492483
     484    $network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
     485
    493486    foreach ( $active_plugins as $plugin ) {
    494487        if ( ! validate_file( $plugin ) // $plugin must validate as file
    495488            && '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
    496489            && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
     490            // not already included as a network plugin
     491            && ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins ) )
    497492            )
    498493        $plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
Note: See TracChangeset for help on using the changeset viewer.