From fc12afebbc41e18e4e030a7e6617c4ef75f7a3d2 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@git.wordpress.org>
Date: Wed, 16 Jan 2008 16:46:49 +0000
Subject: [PATCH] Always show plugin activation errors. Props DD32. fixes #5673

git-svn-id: https://develop.svn.wordpress.org/trunk@6627 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/plugins.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 2742dae26a..a741e85a72 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -16,6 +16,8 @@ if ( isset($_GET['action']) ) {
 		$valid = validate_plugin($plugin);
 		if ( is_wp_error($valid) )
 			wp_die($valid);
+		error_reporting( E_ALL ^ E_NOTICE );
+		@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
 		include(ABSPATH . PLUGINDIR . '/' . $plugin);
 	} elseif ( 'deactivate' == $_GET['action'] ) {
 		check_admin_referer('deactivate-plugin_' . $_GET['plugin']);
@@ -45,7 +47,7 @@ validate_active_plugins();
 	<div id="message" class="updated fade"><p><?php _e('Plugin could not be activated because it triggered a <strong>fatal error</strong>.') ?></p>
 	<?php
 		$plugin = trim($_GET['plugin']);
-		if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $plugin) && 1 == strtolower(ini_get('display_errors'))) { ?>
+		if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $plugin) ) { ?>
 	<iframe style="border:0" width="100%" height="70px" src="<?php bloginfo('wpurl'); ?>/wp-admin/plugins.php?action=error_scrape&amp;plugin=<?php echo attribute_escape($plugin); ?>&amp;_wpnonce=<?php echo attribute_escape($_GET['_error_nonce']); ?>"></iframe>
 	<?php
 		}