<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[17632] trunk: Remove more E_RECOVERABLE_ERROR checks.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17632">17632</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-04-12 09:21:13 +0000 (Tue, 12 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove more E_RECOVERABLE_ERROR checks. props duck_, see <a href="http://trac.wordpress.org/ticket/16920">#16920</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminupdatephp">trunk/wp-admin/update.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (17631 => 17632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2011-04-11 18:57:34 UTC (rev 17631)
+++ trunk/wp-admin/plugins.php 2011-04-12 09:21:13 UTC (rev 17632)
</span><span class="lines">@@ -137,10 +137,7 @@
</span><span class="cx"> wp_die($valid);
</span><span class="cx">
</span><span class="cx"> if ( ! WP_DEBUG ) {
</span><del>- if ( defined('E_RECOVERABLE_ERROR') )
- error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
- else
- error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
</del><ins>+ error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
</span></span></pre></div>
<a id="trunkwpadminupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update.php (17631 => 17632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update.php 2011-04-11 18:57:34 UTC (rev 17631)
+++ trunk/wp-admin/update.php 2011-04-12 09:21:13 UTC (rev 17632)
</span><span class="lines">@@ -82,11 +82,7 @@
</span><span class="cx"> if ( isset($_GET['failure']) ){
</span><span class="cx"> echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
</span><span class="cx">
</span><del>- if ( defined('E_RECOVERABLE_ERROR') )
- error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
- else
- error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
-
</del><ins>+ error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
</ins><span class="cx"> @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
</span><span class="cx"> include(WP_PLUGIN_DIR . '/' . $plugin);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (17631 => 17632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2011-04-11 18:57:34 UTC (rev 17631)
+++ trunk/wp-includes/load.php 2011-04-12 09:21:13 UTC (rev 17632)
</span><span class="lines">@@ -271,10 +271,7 @@
</span><span class="cx"> ini_set( 'error_log', WP_CONTENT_DIR . '/debug.log' );
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- if ( defined( 'E_RECOVERABLE_ERROR' ) )
- error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
- else
- error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING );
</del><ins>+ error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>