Index: pearcmd.php
===================================================================
RCS file: /repository/php-src/pear/scripts/pearcmd.php,v
retrieving revision 1.9
diff -u -r1.9 pearcmd.php
--- pearcmd.php	26 Jan 2004 01:59:14 -0000	1.9
+++ pearcmd.php	27 Jan 2004 00:13:18 -0000
@@ -265,9 +265,18 @@
 // }}}
 
 function error_handler($errno, $errmsg, $file, $line, $vars) {
-    if ((defined('E_STRICT') && $errno & E_STRICT) || !error_reporting()) {
+    if (!error_reporting()) {
         return; // @silenced error
     }
+    if (defined('E_STRICT')) {
+        if ($errno & E_STRICT
+            && (error_reporting() & E_STRICT) != E_STRICT) {
+            // Ignore E_STRICT notices unless they have been turned on
+            return;
+        }
+    } else {
+        define('E_STRICT', 2048);
+    }
     $errortype = array (
         E_ERROR   =>  "Error",
         E_WARNING   =>  "Warning",
@@ -279,7 +288,8 @@
         E_COMPILE_WARNING =>  "Compile Warning",
         E_USER_ERROR =>  "User Error",
         E_USER_WARNING =>  "User Warning",
-        E_USER_NOTICE =>  "User Notice"
+        E_USER_NOTICE =>  "User Notice",
+        E_STRICT => 'Strict Notice',
     );
     $prefix = $errortype[$errno];
     $file = basename($file);