From 6c9fa67eca9ec6dd430bb8172f9971ca43282672 Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Wed, 26 Nov 2003 15:08:42 +0000 Subject: [PATCH] fix Bug #293 [Patch] PEAR_Error not calling static method callbacks for error-handler --- pear/PEAR.php | 8 +------- pear/package-PEAR.xml | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pear/PEAR.php b/pear/PEAR.php index ef683a876f..a10d90373b 100644 --- a/pear/PEAR.php +++ b/pear/PEAR.php @@ -766,14 +766,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="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 -- 2.50.1