Browse Source

fix Bug #293 [Patch] PEAR_Error not calling static method callbacks for error-handler

PEAR_1_4DEV
Greg Beaver 22 years ago
parent
commit
6c9fa67eca
  1. 8
      pear/PEAR.php
  2. 1
      pear/package-PEAR.xml

8
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) {

1
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" />

Loading…
Cancel
Save