Changes from trunk/wp-admin/includes/plugin.php at r8266 to branches/2.6/wp-admin/includes/plugin.php at r8521

File:

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

branches/2.6/wp-admin/includes/plugin.php

@@ -35 +35 @@
     
     if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') )
-        $cached_plugins = array();
+        $cache_plugins = array();
     
     if ( isset($cache_plugins[ $plugin_folder ]) )
@@ -240 +240 @@
     }
 
+    //Invalid is any plugin that is deactivated due to error.
+    $invalid = array(); 
+
     // If a plugin file does not exist, remove it from the list of active
     // plugins.
@@ -245 +248 @@
         $result = validate_plugin($check_plugin);
         if ( is_wp_error( $result ) ) {
+            $invalid[$check_plugin] = $result;
             deactivate_plugins( $check_plugin, true);
         }
     }
+    return $invalid;
 }