[PHP-CVS] cvs: php-src(PHP_5_0) /pear PEAR.php

[Greg Beaver]

cellog          Mon Aug 22 18:04:58 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/pear       PEAR.php 
  Log:
  sync with PEAR 1.3.6
  
http://cvs.php.net/diff.php/php-src/pear/PEAR.php?r1=1.82.2.1&r2=1.82.2.2&ty=u
Index: php-src/pear/PEAR.php
diff -u php-src/pear/PEAR.php:1.82.2.1 php-src/pear/PEAR.php:1.82.2.2
--- php-src/pear/PEAR.php:1.82.2.1      Mon Mar 28 11:46:06 2005
+++ php-src/pear/PEAR.php       Mon Aug 22 18:04:58 2005
@@ -18,7 +18,7 @@
 // |          Tomas V.V.Cox <[EMAIL PROTECTED]>                           |
 // +--------------------------------------------------------------------+
 //
-// $Id: PEAR.php,v 1.82.2.1 2005/03/28 16:46:06 cellog Exp $
+// $Id: PEAR.php,v 1.82.2.2 2005/08/22 22:04:58 cellog Exp $
 //
 
 define('PEAR_ERROR_RETURN',     1);
@@ -492,7 +492,7 @@
      * @see PEAR::setErrorHandling
      * @since PHP 4.0.5
      */
-    function raiseError($message = null,
+    function &raiseError($message = null,
                          $code = null,
                          $mode = null,
                          $options = null,
@@ -537,9 +537,11 @@
             $ec = 'PEAR_Error';
         }
         if ($skipmsg) {
-            return new $ec($code, $mode, $options, $userinfo);
+            $a = &new $ec($code, $mode, $options, $userinfo);
+            return $a;
         } else {
-            return new $ec($message, $code, $mode, $options, $userinfo);
+            $a = &new $ec($message, $code, $mode, $options, $userinfo);
+            return $a;
         }
     }
 
@@ -558,9 +560,11 @@
                          $userinfo = null)
     {
         if (isset($this) && is_a($this, 'PEAR')) {
-            return $this->raiseError($message, $code, null, null, $userinfo);
+            $a = &$this->raiseError($message, $code, null, null, $userinfo);
+            return $a;
         } else {
-            return PEAR::raiseError($message, $code, null, null, $userinfo);
+            $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
+            return $a;
         }
     }
 

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