Changeset 7456

Timestamp:

03/21/2008 07:34:27 PM (18 years ago)

Author:

markjaquith

Message:

Better plugin-deactivation array-fu from Denis-de-Bernardy. fixes #6332

Location:

trunk/wp-admin

Files:

• includes/plugin.php (modified) (1 diff)
• plugin-editor.php (modified) (1 diff)

trunk/wp-admin/includes/plugin.php

@@ -120 +120 @@
         if( false === $item)
             continue;
-        array_splice($current, $item, 1 ); // Array-fu!
+        if ( ( $key = array_search( $plugin, $current) ) !== false )
+            array_splice($current, $key, 1 ); // Fixed Array-fu!
         do_action('deactivate_' . trim( $plugin ));
     }

trunk/wp-admin/plugin-editor.php

@@ -41 +41 @@
         if ( in_array($file, $current) || isset($_POST['phperror']) ) {
             if ( in_array($file, $current) ) {
-                array_splice($current, array_search( $file, $current), 1 ); // Array-fu!
+                if ( ( $key = array_search( $plugin, $current) ) !== false )
+                    array_splice($current, $key, 1 ); // Fixed Array-fu!
                 update_option('active_plugins', $current);
             }