diff --git a/wp-settings.php b/wp-settings.php
index db22b5854..f9d694f6e 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -201,9 +201,9 @@ timer_start();
 if (defined('WP_DEBUG') and WP_DEBUG == true) {
 	error_reporting(E_ALL);
 } else {
-	if ( defined( 'E_DEPRECATED' ) )
-		error_reporting(E_ALL ^ E_STRICT ^ E_DEPRECATED ^ E_NOTICE ^ E_USER_NOTICE);
-	else if ( defined( 'E_STRICT' ) )
+	if ( defined( 'E_DEPRECATED' ) ) // Introduced in PHP 5.3
+		error_reporting( (E_ALL ^ E_DEPRECATED ^ E_NOTICE ^ E_USER_NOTICE) & E_STRICT);
+	else if ( defined( 'E_STRICT' ) ) // Introduced in PHP 5.0 not part of E_ALL
 		error_reporting( ( E_ALL ^ E_NOTICE ^ E_USER_NOTICE ) & E_STRICT);
 	else
 		error_reporting(E_ALL ^ E_NOTICE ^ E_USER_NOTICE);