Changeset 11966

Timestamp:

09/24/2009 04:15:37 AM (17 years ago)

Author:

markjaquith

Message:

Active plugin filter, plugin deactivation array_splice() protection. props apeatling. fixes #10839

Location:

trunk

Files:

• wp-admin/includes/plugin.php (modified) (3 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/includes/plugin.php

@@ -273 +273 @@
  */
 function is_plugin_active($plugin) {
-        return in_array($plugin, get_option('active_plugins'));
+        return in_array( $plugin, apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) );
 }
 
@@ -348 +348 @@
                 if ( ! $silent )
                         do_action( 'deactivate_plugin', trim( $plugin ) );
-                array_splice($current, array_search( $plugin, $current), 1 ); // Fixed Array-fu!
+                        
+                $key = array_search( $plugin, (array) $current );
+                
+                if ( false !== $key )
+                        array_splice( $current, $key, 1 );
+                        
                 //Used by Plugin updater to internally deactivate plugin, however, not to notify plugins of the fact to prevent plugin output.
                 if ( ! $silent ) {
@@ -485 +490 @@
 
 function validate_active_plugins() {
-        $check_plugins = get_option('active_plugins');
+        $check_plugins = apply_filters( 'active_plugins', get_option('active_plugins') ); 
 
         // Sanity check.  If the active plugin list is not an array, make it an

trunk/wp-settings.php

@@ -553 +553 @@
 }
 
-$current_plugins = get_option('active_plugins');
+$current_plugins = apply_filters( 'active_plugins', get_option( 'active_plugins' ) );
 if ( is_array($current_plugins) && !defined('WP_INSTALLING') ) {
         foreach ( $current_plugins as $plugin ) {