Separate E_STRICT reporting from E_ALL in internal debug mode (E_STRICT is included...

[squirrelmail.git] / include / init.php

diff --git a/include/init.php b/include/init.php
index 2017640db2fe437d07f7ff35fd4bad0a0106d48d..eb5336537b8b8486fb4cc736edc2817727762792 100644 (file)
--- a/include/init.php
+++ b/include/init.php
@@ -223,15 +223,17 @@ if (file_exists(SM_PATH . 'config/config_local.php')) {
 
 /**
  * Set PHP error reporting level based on the SquirrelMail debug mode
 
 /**
  * Set PHP error reporting level based on the SquirrelMail debug mode

+ * E_STRICT = 2048
+ * E_DEPRECATED = 8192

  */
 $error_level = 0;
 if ($sm_debug_mode & SM_DEBUG_MODE_SIMPLE)
     $error_level |= E_ERROR;
 if ($sm_debug_mode & SM_DEBUG_MODE_MODERATE
  || $sm_debug_mode & SM_DEBUG_MODE_ADVANCED)
  */
 $error_level = 0;
 if ($sm_debug_mode & SM_DEBUG_MODE_SIMPLE)
     $error_level |= E_ERROR;
 if ($sm_debug_mode & SM_DEBUG_MODE_MODERATE
  || $sm_debug_mode & SM_DEBUG_MODE_ADVANCED)

-    $error_level |= E_ALL;
+    $error_level = ($error_level | E_ALL) & ~2048 & ~8192;

 if ($sm_debug_mode & SM_DEBUG_MODE_STRICT)
 if ($sm_debug_mode & SM_DEBUG_MODE_STRICT)

-    $error_level |= E_STRICT;
+    $error_level |= 2048 | 8192;

 error_reporting($error_level);
 
 
 error_reporting($error_level);