Changeset 15017 for trunk/wp-admin/plugins.php

Timestamp:

05/28/2010 12:18:00 AM (16 years ago)

Author:

ryan

Message:

Allow plugin activation even if plugin generates extra output. Make warning more informative. fixes #13585

File:

• trunk/wp-admin/plugins.php (modified) (1 diff)

trunk/wp-admin/plugins.php

@@ -335 +335 @@
 <?php if ( isset($_GET['error']) ) :
 
-        if (isset($_GET['charsout']))
-                $errmsg = sprintf(__('Plugin could not be activated because it generated %d characters of <strong>unexpected output</strong>.'), $_GET['charsout']);
+        if ( isset($_GET['charsout']) )
+                $errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation.  If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
         else
                 $errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
-
         ?>
         <div id="message" class="updated"><p><?php echo $errmsg; ?></p>
         <?php
-                if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $plugin) ) { ?>
+                if ( !isset($_GET['charsout']) && wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $plugin) ) { ?>
         <iframe style="border:0" width="100%" height="70px" src="<?php echo admin_url('plugins.php?action=error_scrape&amp;plugin=' . esc_attr($plugin) . '&amp;_wpnonce=' . esc_attr($_GET['_error_nonce'])); ?>"></iframe>
         <?php