WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@638 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 3 insertions, 3 deletions

diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index 3085261..690baaf 100644
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -1,6 +1,6 @@
 <?php
-die();
 require_once('admin.php');
+wp_die( "The plugin editor is disabled" );
 
 $title = __("Edit Plugins");
 $parent_file = 'plugins.php';
@@ -24,7 +24,7 @@ case 'update':
 	check_admin_referer('edit-plugin_' . $file);
 
 	if ( !current_user_can('edit_plugins') )
-		die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
+		wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
 
 	$newcontent = stripslashes($_POST['newcontent']);
 	if (is_writeable($real_file)) {
@@ -44,7 +44,7 @@ default:
 
 	require_once('admin-header.php');
 	if ( !current_user_can('edit_plugins') )
-		die('<p>'.__('You do not have sufficient permissions to edit plugins for this blog.').'</p>');
+		wp_die('<p>'.__('You do not have sufficient permissions to edit plugins for this blog.').'</p>');
 
 	update_recently_edited("wp-content/plugins/$file");