cvs: php-src /pear/PEAR Exception.php
| From: | Tomas V.V.Cox | Date: | Mon, 21 Jun 2004 04:36:17 +0000 |
| Subject: | cvs: php-src /pear/PEAR Exception.php | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-core+get-405@lists.php.net to get a copy of this message | ||
cox Mon Jun 21 00:36:17 2004 EDT
Modified files:
/php-src/pear/PEAR Exception.php
Log:
More output magic on nested exceptions
http://cvs.php.net/diff.php/php-src/pear/PEAR/Exception.php?r1=1.3&r2=1.4&ty=u
Index: php-src/pear/PEAR/Exception.php
diff -u php-src/pear/PEAR/Exception.php:1.3 php-src/pear/PEAR/Exception.php:1.4
--- php-src/pear/PEAR/Exception.php:1.3 Mon Jun 21 00:06:18 2004
+++ php-src/pear/PEAR/Exception.php Mon Jun 21 00:36:17 2004
@@ -18,7 +18,7 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: Exception.php,v 1.3 2004/06/21 04:06:18 cox Exp $
+// $Id: Exception.php,v 1.4 2004/06/21 04:36:17 cox Exp $
define('PEAR_OBSERVER_PRINT', -2);
define('PEAR_OBSERVER_TRIGGER', -4);
@@ -85,7 +85,7 @@
*
* @since PHP 5
* @package PEAR
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
* @author Tomas V.V.Cox <cox@idecnet.com>
* @author Hans Lellelid <hans@velum.net>
*
@@ -176,9 +176,10 @@
private function _getCauseMessage()
{
- $msg = ' ' . $this->_method . " at {$this->file}
({$this->line})\n";
+ $msg = " #{$this->_method} at {$this->file} ({$this->line})\n" .
+ " {$this->message}\n";
if ($this->cause instanceof Exception) {
- return $msg . $this->cause->_getCauseMessage();
+ return $this->cause->_getCauseMessage() . $msg;
}
return $msg;
}