Changeset 12383

Timestamp:

12/12/2009 09:20:07 AM (16 years ago)

Author:

azaozz

Message:

Do not stop plugin activation due to E_DEPRECATED errors in php 5.3, props Denis-de-Bernardy, fixes #11250

Location:

trunk/wp-admin

Files:

• plugins.php (modified) (1 diff)
• update.php (modified) (1 diff)

trunk/wp-admin/plugins.php

@@ -94 +94 @@
                 wp_die($valid);
 
-            error_reporting( E_ALL ^ E_NOTICE );
+            if ( defined('E_RECOVERABLE_ERROR') )
+                error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
+            else
+                error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
+
             @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
             include(WP_PLUGIN_DIR . '/' . $plugin);

trunk/wp-admin/update.php

@@ -53 +53 @@
         if( isset($_GET['failure']) ){
             echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
-            error_reporting( E_ALL ^ E_NOTICE );
+
+            if ( defined('E_RECOVERABLE_ERROR') )
+                error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
+            else
+                error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
+
             @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
             include(WP_PLUGIN_DIR . '/' . $plugin);