MFH Bug #293

diff --git a/pear/PEAR.php b/pear/PEAR.php
index ef683a876f8f3eee403dfd0504ed9272c2b63c44..2a7812316c5602b85cb945b32a6f7825454d455e 100644 (file)
--- 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 2ed2445108786483bf41c1da3469cad4e652b95d..b97b03b37ab5c7a636300f312d714f99d8efb65b 100644 (file)
--- a/pear/package-PEAR.xml
+++ b/pear/package-PEAR.xml
@@ -56,6 +56,7 @@ PEAR Installer:
 * Bug #171 --alldeps with a rel="eq" 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" />