[PHP-CVS] cvs: php-src(PHP_5_1) /pear PEAR.php package-PEAR.xml

[Greg Beaver]

cellog          Wed Aug 17 17:48:47 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/pear       PEAR.php package-PEAR.xml 
  Log:
  add return by ref from PEAR::raiseError
  
http://cvs.php.net/diff.php/php-src/pear/PEAR.php?r1=1.83&r2=1.83.2.1&ty=u
Index: php-src/pear/PEAR.php
diff -u php-src/pear/PEAR.php:1.83 php-src/pear/PEAR.php:1.83.2.1
--- php-src/pear/PEAR.php:1.83  Mon Mar 28 11:38:58 2005
+++ php-src/pear/PEAR.php       Wed Aug 17 17:48:46 2005
@@ -18,7 +18,7 @@
 // |          Tomas V.V.Cox <[EMAIL PROTECTED]>                           |
 // +--------------------------------------------------------------------+
 //
-// $Id: PEAR.php,v 1.83 2005/03/28 16:38:58 cellog Exp $
+// $Id: PEAR.php,v 1.83.2.1 2005/08/17 21:48:46 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;
         }
     }
 
@@ -553,14 +555,16 @@
      * @param string $message
      *
      */
-    function throwError($message = null,
+    function &throwError($message = null,
                          $code = null,
                          $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;
         }
     }
 
http://cvs.php.net/diff.php/php-src/pear/package-PEAR.xml?r1=1.108.2.2&r2=1.108.2.3&ty=u
Index: php-src/pear/package-PEAR.xml
diff -u php-src/pear/package-PEAR.xml:1.108.2.2 
php-src/pear/package-PEAR.xml:1.108.2.3
--- php-src/pear/package-PEAR.xml:1.108.2.2     Wed Aug 17 17:30:46 2005
+++ php-src/pear/package-PEAR.xml       Wed Aug 17 17:48:46 2005
@@ -49,11 +49,12 @@
   </maintainers>
   <release>
     <version>1.3.6</version>
-    <date>2005-08-16</date>
+    <date>2005-08-17</date>
     <state>stable</state>
     <license>PHP License</license>
     <notes>
  * Bump XML_RPC dependency to 1.4.0
+ * return by reference from PEAR::raiseError()
     </notes>
     <provides type="class" name="OS_Guess" />
     <provides type="class" name="System" />

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