From: Pierre Joye <pajoye@php.net>
Date: Mon, 26 Jan 2004 01:34:03 +0000 (+0000)
Subject: - MFH
X-Git-Tag: php-4.3.5RC2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=195dcc7eda2f950077dfaf7bbfad251fcc06833e;p=php

- MFH
---

diff --git a/pear/scripts/pear.bat b/pear/scripts/pear.bat
index a605c39583..31c13d990c 100755
--- a/pear/scripts/pear.bat
+++ b/pear/scripts/pear.bat
@@ -1,7 +1,7 @@
 @ECHO OFF
 
 REM ----------------------------------------------------------------------
-REM PHP version 4.0
+REM PHP version 4
 REM ----------------------------------------------------------------------
 REM Copyright (c) 1997-2004 The PHP Group
 REM ----------------------------------------------------------------------
@@ -16,7 +16,7 @@ REM ----------------------------------------------------------------------
 REM  Authors:     Alexander Merz (alexmerz@php.net)
 REM ----------------------------------------------------------------------
 REM
-REM  $Id: pear.bat,v 1.10.4.9 2003/10/20 15:51:46 cox Exp $
+REM  $Id: pear.bat,v 1.18 2004/01/08 17:33:14 sniper Exp $
 
 REM change this lines to match the paths of your system
 REM -------------------
diff --git a/pear/scripts/pearcmd.php b/pear/scripts/pearcmd.php
index 038ee8f14f..b53e6f4854 100644
--- a/pear/scripts/pearcmd.php
+++ b/pear/scripts/pearcmd.php
@@ -33,7 +33,6 @@ ob_implicit_flush(true);
 ini_set('track_errors', true);
 ini_set('html_errors', false);
 ini_set('magic_quotes_runtime', false);
-error_reporting(E_ALL & ~E_NOTICE);
 set_error_handler('error_handler');
 
 $pear_package_version = "@pear_version@";
@@ -265,21 +264,21 @@ function cmdHelp($command)
 // }}}
 
 function error_handler($errno, $errmsg, $file, $line, $vars) {
-    if (error_reporting() == 0) {
+    if ((defined('E_STRICT') && $errno & E_STRICT) || !error_reporting()) {
         return; // @silenced error
     }
     $errortype = array (
-        1   =>  "Error",
-        2   =>  "Warning",
-        4   =>  "Parsing Error",
-        8   =>  "Notice",
-        16  =>  "Core Error",
-        32  =>  "Core Warning",
-        64  =>  "Compile Error",
-        128 =>  "Compile Warning",
-        256 =>  "User Error",
-        512 =>  "User Warning",
-        1024=>  "User Notice"
+        E_ERROR   =>  "Error",
+        E_WARNING   =>  "Warning",
+        E_PARSE   =>  "Parsing Error",
+        E_NOTICE   =>  "Notice",
+        E_CORE_ERROR  =>  "Core Error",
+        E_CORE_WARNING  =>  "Core Warning",
+        E_COMPILE_ERROR  =>  "Compile Error",
+        E_COMPILE_WARNING =>  "Compile Warning",
+        E_USER_ERROR =>  "User Error",
+        E_USER_WARNING =>  "User Warning",
+        E_USER_NOTICE =>  "User Notice"
     );
     $prefix = $errortype[$errno];
     $file = basename($file);