Changeset 8496

Timestamp:

07/30/2008 12:02:47 AM (18 years ago)

Author:

azaozz

Message:

Fix error message when invalidating plugin because of bad path.

Location:

trunk/wp-admin

Files:

• includes/plugin.php (modified) (1 diff)
• plugins.php (modified) (1 diff)

trunk/wp-admin/includes/plugin.php

@@ -322 +322 @@
 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.'));

trunk/wp-admin/plugins.php

@@ -169 +169 @@
 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>';
 ?>