* Also fix #21845 in the release branch.

# This is *no* complete MFH, I just applied the patch in the other branch.

diff --git a/pear/PEAR.php b/pear/PEAR.php
index 7f034b7b0a9952e535e92acc1409a54f0cbdaeda..ec59e1b93e2ece764303d794a6dc69684d87c245 100644 (file)
--- a/pear/PEAR.php
+++ b/pear/PEAR.php
@@ -525,7 +525,7 @@ class PEAR
                          $code = null,
                          $userinfo = null)
     {
-        if (isset($this)) {
+        if (isset($this) && is_subclass_of($this, 'PEAR_Error')) {
             return $this->raiseError($message, $code, null, null, $userinfo);
         } else {
             return PEAR::raiseError($message, $code, null, null, $userinfo);