From bfa3b629e0d67016ec83050c5db762479af40609 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Wed, 13 Aug 2008 15:13:05 +0000
Subject: Merge with WP revision 8635

git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1421 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/plugins.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'wp-admin/plugins.php')

diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 15996ae..b1edbc0 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -172,8 +172,10 @@ wp_enqueue_script('admin-forms');
 $title = __('Manage Plugins');
 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>';
 ?>
 
 <?php if ( isset($_GET['error']) ) : ?>
-- 
cgit