cvs: pear /Log Log.php /Log/Log observer.php

jon Tue Jan 3 04:53:22 2006 UTC Modified files: /pear/Log Log.php /pear/Log/Log observer.php Log: Woops, I had the strict 'new' syntax backwards. We don't want to use the =& syntax anymore. While I'm here, correct Log/observer.php, as well. We also need to return a variable reference to 'null' in the failure case, so make that change, as well. Bug: 6323 http://cvs.php.net/viewcvs.cgi/pear/Log/Log.php?r1=1.53&r2=1.54&diff_format=u Index: pear/Log/Log.php diff -u pear/Log/Log.php:1.53 pear/Log/Log.php:1.54 --- pear/Log/Log.php:1.53 Tue Jan 3 04:32:15 2006 +++ pear/Log/Log.php Tue Jan 3 04:53:22 2006 @@ -1,9 +1,9 @@ <?php /** - * $Header: /repository/pear/Log/Log.php,v 1.53 2006/01/03 04:32:15 jon Exp $ + * $Header: /repository/pear/Log/Log.php,v 1.54 2006/01/03 04:53:22 jon Exp $ * $Horde: horde/lib/Log.php,v 1.15 2000/06/29 23:39:45 jon Exp $ * - * @version $Revision: 1.53 $ + * @version $Revision: 1.54 $ * @package Log */ @@ -127,11 +127,12 @@ /* If the class exists, return a new instance of it. */ if (class_exists($class)) { - $obj =& new $class($name, $ident, $conf, $level); + $obj = new $class($name, $ident, $conf, $level); return $obj; } - return null; + $null = null; + return $null; } /** http://cvs.php.net/viewcvs.cgi/pear/Log/Log/observer.php?r1=1.14&r2=1.15&diff_format=u Index: pear/Log/Log/observer.php diff -u pear/Log/Log/observer.php:1.14 pear/Log/Log/observer.php:1.15 --- pear/Log/Log/observer.php:1.14 Wed Oct 26 05:46:56 2005 +++ pear/Log/Log/observer.php Tue Jan 3 04:53:22 2006 @@ -1,9 +1,9 @@ <?php /** - * $Header: /repository/pear/Log/Log/observer.php,v 1.14 2005/10/26 05:46:56 jon Exp $ + * $Header: /repository/pear/Log/Log/observer.php,v 1.15 2006/01/03 04:53:22 jon Exp $ * $Horde: horde/lib/Log/observer.php,v 1.5 2000/06/28 21:36:13 jon Exp $ * - * @version $Revision: 1.14 $ + * @version $Revision: 1.15 $ * @package Log */ @@ -99,14 +99,15 @@ if (class_exists($class)) { /* Support both new-style and old-style construction. */ if ($newstyle) { - $object =& new $class($priority, $conf); + $object = new $class($priority, $conf); } else { - $object =& new $class($priority); + $object = new $class($priority); } return $object; } - return null; + $null = null; + return $null; } /**