Changeset 8500

Timestamp:

07/30/2008 06:48:03 AM (16 years ago)

Author:

westi

Message:

Include only valid plugins. Props guillep2k and xknown, fixes #6871 for 2.6.1

Location:

branches/2.6

Files:

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

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

@@ -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;
 }
 

branches/2.6/wp-admin/plugins.php

@@ -166 +166 @@
 require_once('admin-header.php');
 
-validate_active_plugins();
-
+$invalid = validate_active_plugins();
+if( !empty($invalid) )
+    foreach($invalid as $plugin_file => $error)
+        echo '<div id="message" class="error"><p>' . sprintf(__('The plugin <code>%s</code> has been <strong>deactivated</strong> due to an error: %s'), wp_specialchars($plugin_file), $error->get_error_message()) . '</p></div>';
 ?>
 

branches/2.6/wp-settings.php

@@ -422 +422 @@
     if ( is_array($current_plugins) ) {
         foreach ($current_plugins as $plugin) {
-            if ('' != $plugin && file_exists(WP_PLUGIN_DIR . '/' . $plugin))
+            if ( '' != $plugin && 0 == validate_file($plugin) && file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
                 include_once(WP_PLUGIN_DIR . '/' . $plugin);
         }