Changeset 12947 for trunk/wp-admin/includes/plugin.php

Timestamp:

02/04/2010 06:50:36 PM (14 years ago)

Author:

ryan

Message:

Sitewide plugins cleanup. Props nacin. see #11644

File:

• trunk/wp-admin/includes/plugin.php (modified) (4 diffs)

trunk/wp-admin/includes/plugin.php

@@ -260 +260 @@
  */
 function is_plugin_active( $plugin ) {
-    return in_array( $plugin, apply_filters( 'active_plugins', get_option( 'active_plugins', array() ) ) );
+    return in_array( $plugin, (array) get_option( 'active_plugins', array() ) ) || is_plugin_active_for_network( $plugin );
 }
 
@@ -271 +271 @@
  * @return bool True, if active for the network, otherwise false.
  */
-function is_plugin_active_for_network( $plugin ){
+function is_plugin_active_for_network( $plugin ) {
     if ( !is_multisite() )
         return false;
@@ -554 +554 @@
  */
 function validate_active_plugins() {
-    $plugins = apply_filters( 'active_plugins', get_option( 'active_plugins', array() ) );
+    $plugins = get_option( 'active_plugins', array() );
     // validate vartype: array
     if ( ! is_array( $plugins ) ) {
@@ -563 +563 @@
     if ( is_multisite() && is_super_admin() ) {
         $network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-        $plugins = array_merge( (array) $plugins, $network_plugins );
+        $plugins = array_merge( $plugins, $network_plugins );
     }