From ca0751546312f85be1fd77e64cffe841ac0724a1 Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 30 Jul 2008 00:02:47 +0000
Subject: [PATCH] Fix error message when invalidating plugin because of bad
 path.

git-svn-id: http://svn.automattic.com/wordpress/trunk@8496 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/plugin.php | 2 +-
 wp-admin/plugins.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 48f26ce516..cc4d9cb61a 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -321,7 +321,7 @@ function validate_active_plugins() {
 
 function validate_plugin($plugin) {
 	if ( validate_file($plugin) )
-		return new WP_Error('plugin_invalid', __('Invalid plugin.'));
+		return new WP_Error('plugin_invalid', __('Invalid plugin path.'));
 	if ( ! file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
 		return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));
 
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index a24e88aed8..e8133271e1 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -168,7 +168,7 @@ require_once('admin-header.php');
 $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 <em>"%s"</em>.'), $plugin_file, $error->get_error_message()) . '</p></div>';
+		echo '<div id="message" class="error"><p>' . sprintf(__('The plugin <code>%s</code> has been <strong>deactivated</strong> due to an error: %s'), $plugin_file, $error->get_error_message()) . '</p></div>';
 ?>
 
 <?php if ( isset($_GET['error']) ) : ?>