cvs: pear-core / package-PEAR.xml package2.xml /PEAR Exception.php

cellog          Mon Oct 30 03:47:48 2006 UTC

  Modified files:              
    /pear-core/PEAR     Exception.php 
    /pear-core  package-PEAR.xml package2.xml 
  Log:
    * fix Bug #9101: PEAR_Exception::getCauseMessage() failure with a
                     nested Exception (Adam Harvey)
  
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/Exception.php?r1=1.25&r2=1.26&diff_format=u
Index: pear-core/PEAR/Exception.php
diff -u pear-core/PEAR/Exception.php:1.25 pear-core/PEAR/Exception.php:1.26
--- pear-core/PEAR/Exception.php:1.25   Mon Sep 25 14:14:40 2006
+++ pear-core/PEAR/Exception.php        Mon Oct 30 03:47:48 2006
@@ -19,7 +19,7 @@
  * @author     Greg Beaver <cellog@xxxxxxx>
  * @copyright  1997-2006 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Exception.php,v 1.25 2006/09/25 14:14:40 cellog Exp $
+ * @version    CVS: $Id: Exception.php,v 1.26 2006/10/30 03:47:48 cellog Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.3.3
  */
@@ -254,10 +254,10 @@
         if ($this->cause instanceof PEAR_Exception) {
             $this->cause->getCauseMessage($causes);
         } elseif ($this->cause instanceof Exception) {
-            $causes[] = array('class'   => get_class($cause),
-                              'message' => $cause->getMessage(),
-                              'file' => $cause->getFile(),
-                              'line' => $cause->getLine());
+            $causes[] = array('class'   => get_class($this->cause),
+                              'message' => $this->cause->getMessage(),
+                              'file' => $this->cause->getFile(),
+                              'line' => $this->cause->getLine());
         } elseif (class_exists('PEAR_Error') && $this->cause instanceof 
PEAR_Error) {
             $causes[] = array('class' => get_class($this->cause),
                               'message' => $this->cause->getMessage());
http://cvs.php.net/viewvc.cgi/pear-core/package-PEAR.xml?r1=1.396&r2=1.397&diff_format=u
Index: pear-core/package-PEAR.xml
diff -u pear-core/package-PEAR.xml:1.396 pear-core/package-PEAR.xml:1.397
--- pear-core/package-PEAR.xml:1.396    Sun Oct 22 18:20:58 2006
+++ pear-core/package-PEAR.xml  Mon Oct 30 03:47:48 2006
@@ -86,6 +86,8 @@
   Minor feature addition
   * fix Bug #8553: PEAR_Installer_Role_Common::processInstallation() does not 
honor layer
   * fix Bug #8794: upgrade-all including Auth fails with fatal error
+  * fix Bug #9101: PEAR_Exception::getCauseMessage() failure with a
+                   nested Exception (Adam Harvey)
   * fix Bug #9135: pear bundle fails if php_dir is not writeable
   * implement Request #8827: add a yesno type handling for post-install scripts
   </notes>
http://cvs.php.net/viewvc.cgi/pear-core/package2.xml?r1=1.292&r2=1.293&diff_format=u
Index: pear-core/package2.xml
diff -u pear-core/package2.xml:1.292 pear-core/package2.xml:1.293
--- pear-core/package2.xml:1.292        Sun Oct 22 18:20:58 2006
+++ pear-core/package2.xml      Mon Oct 30 03:47:48 2006
@@ -91,6 +91,8 @@
   Minor feature addition
   * fix Bug #8553: PEAR_Installer_Role_Common::processInstallation() does not 
honor layer
   * fix Bug #8794: upgrade-all including Auth fails with fatal error
+  * fix Bug #9101: PEAR_Exception::getCauseMessage() failure with a
+                   nested Exception (Adam Harvey)
   * fix Bug #9135: pear bundle fails if php_dir is not writeable
   * implement Request #8827: add a yesno type handling for post-install scripts
  </notes>

-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php