From: Greg Beaver <cellog@php.net>
Date: Wed, 26 Nov 2003 15:11:19 +0000 (+0000)
Subject: MFH Bug #293
X-Git-Tag: php-4.3.5RC1~168
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f718d420da52aad680307fa0fdd88717fe82692;p=php

MFH Bug #293
---

diff --git a/pear/PEAR.php b/pear/PEAR.php
index ef683a876f..2a7812316c 100644
--- a/pear/PEAR.php
+++ b/pear/PEAR.php
@@ -18,7 +18,11 @@
 // |          Tomas V.V.Cox <cox@idecnet.com>                             |
 // +----------------------------------------------------------------------+
 //
+<<<<<<< PEAR.php
 // $Id$
+=======
+// $Id$
+>>>>>>> 1.71
 //
 
 define('PEAR_ERROR_RETURN',     1);
@@ -766,14 +770,8 @@ class PEAR_Error
             die(sprintf($format, $msg));
         }
         if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_string($this->callback) && strlen($this->callback)) {
+            if (is_callable($this->callback)) {
                 call_user_func($this->callback, $this);
-            } elseif (is_array($this->callback) &&
-                      sizeof($this->callback) == 2 &&
-                      is_object($this->callback[0]) &&
-                      is_string($this->callback[1]) &&
-                      strlen($this->callback[1])) {
-                      call_user_func($this->callback, $this);
             }
         }
         if (PEAR_ZE2 && $this->mode & PEAR_ERROR_EXCEPTION) {
diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml
index 2ed2445108..b97b03b37a 100644
--- a/pear/package-PEAR.xml
+++ b/pear/package-PEAR.xml
@@ -56,6 +56,7 @@ PEAR Installer:
 * Bug #171 --alldeps with a rel=&quot;eq&quot; should install the required version, if possible
 * Bug #249 installing from an url doesnt work
 * Bug #248 --force command does not work as expected
+* Bug #293 [Patch] PEAR_Error not calling static method callbacks for error-handler
 
     </notes>
     <provides type="class" name="OS_Guess" />