Ticket #8701: 8701.correct.diff

File 8701.correct.diff, 973 bytes (added by jacobsantos, 4 years ago)

Fix error reporting for PHP 6 and PHP 5.3

Line 
1Index: wp-settings.php
2===================================================================
3--- wp-settings.php     (revision 10421)
4+++ wp-settings.php     (working copy)
5@@ -201,10 +201,11 @@
6 if (defined('WP_DEBUG') and WP_DEBUG == true) {
7        error_reporting(E_ALL);
8 } else {
9-       if ( defined( 'E_DEPRECATED' ) ) // Introduced in PHP 5.3
10-               error_reporting( (E_ALL ^ E_DEPRECATED ^ E_NOTICE ^ E_USER_NOTICE) & E_STRICT);
11-       else if ( defined( 'E_STRICT' ) ) // Introduced in PHP 5.0 not part of E_ALL
12-               error_reporting( ( E_ALL ^ E_NOTICE ^ E_USER_NOTICE ) & E_STRICT);
13+       // Unicode Extension is in PHP 6.0 only or do version check when this changes.
14+       if ( function_exists('unicode_decode') )
15+               error_reporting( E_ALL ^ E_DEPRECATED ^ E_NOTICE ^ E_USER_NOTICE ^ E_STRICT );
16+       else if ( defined( 'E_DEPRECATED' ) ) // Introduced in PHP 5.3
17+               error_reporting( E_ALL ^ E_DEPRECATED ^ E_NOTICE ^ E_USER_NOTICE );
18        else
19                error_reporting(E_ALL ^ E_NOTICE ^ E_USER_NOTICE);
20 }