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

Timestamp:

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

Author:

markjaquith

Message:

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

File:

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

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