Changeset 6627

Timestamp:

01/16/2008 04:46:49 PM (17 years ago)

Author:

ryan

Message:

Always show plugin activation errors. Props DD32. fixes #5673

File:

• trunk/wp-admin/plugins.php (modified) (2 diffs)

trunk/wp-admin/plugins.php

@@ -17 +17 @@
         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'] ) {
@@ -46 +48 @@
     <?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