cvs: pear /DB_DataObject DataObject.php

alan_k Tue Nov 8 20:34:56 2005 EDT Modified files: /pear/DB_DataObject DataObject.php Log: fix PHP4.4* issues with returning by reference.. http://cvs.php.net/diff.php/pear/DB_DataObject/DataObject.php?r1=1.387&r2=1.388&ty=u Index: pear/DB_DataObject/DataObject.php diff -u pear/DB_DataObject/DataObject.php:1.387 pear/DB_DataObject/DataObject.php:1.388 --- pear/DB_DataObject/DataObject.php:1.387 Mon Nov 7 00:47:46 2005 +++ pear/DB_DataObject/DataObject.php Tue Nov 8 20:34:53 2005 @@ -15,7 +15,7 @@ * @author Alan Knowles <alan@akbkhome.com> * @copyright 1997-2005 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: DataObject.php,v 1.387 2005/11/07 05:47:46 alan_k Exp $ + * @version CVS: $Id: DataObject.php,v 1.388 2005/11/09 01:34:53 alan_k Exp $ * @link http://pear.php.net/package/DB_DataObject */ @@ -352,7 +352,8 @@ $obj = DB_DataObject::factory(substr($class,strlen($_DB_DATAOBJECT['CONFIG']['class_prefix']))); if (PEAR::isError($obj)) { DB_DataObject::raiseError("could not autoload $class", DB_DATAOBJECT_ERROR_NOCLASS); - return false; + $r = false; + return $r; } if (!isset($_DB_DATAOBJECT['CACHE'][$lclass])) { @@ -360,7 +361,8 @@ } if (!$obj->get($k,$v)) { DB_DataObject::raiseError("No Data return from get $k $v", DB_DATAOBJECT_ERROR_NODATA); - return false; + $r = false; + return $r; } $_DB_DATAOBJECT['CACHE'][$lclass][$key] = $obj; return $_DB_DATAOBJECT['CACHE'][$lclass][$key]; @@ -2753,22 +2755,26 @@ if ($p = strpos($row,".")) { $row = substr($row,0,$p); } - return $r = &$this->getLink($row,$table,$link); + $r = &$this->getLink($row,$table,$link); + return $r; } $this->raiseError( "getLink: $row is not defined as a link (normally this is ok)", DB_DATAOBJECT_ERROR_NODATA); - return false; // technically a possible error condition? + $r = false; + return $r;// technically a possible error condition? } // use the old _ method - this shouldnt happen if called via getLinks() if (!($p = strpos($row, '_'))) { - return null; + $r = null; + return $r; } $table = substr($row, 0, $p); - return $r = &$this->getLink($row, $table); + $r = &$this->getLink($row, $table); + return $r; } @@ -2776,7 +2782,8 @@ if (!isset($this->$row)) { $this->raiseError("getLink: row not set $row", DB_DATAOBJECT_ERROR_NODATA); - return false; + $r = false; + return $r; } // check to see if we know anything about this table.. @@ -2787,19 +2794,22 @@ $this->raiseError( "getLink:Could not find class for row $row, table $table", DB_DATAOBJECT_ERROR_INVALIDCONFIG); - return false; + $r = false; + return $r; } if ($link) { if ($obj->get($link, $this->$row)) { return $obj; } - return false; + $r = false; + return $r; } if ($obj->get($this->$row)) { return $obj; } - return false; + $r = false; + return $r; } /** @@ -3421,7 +3431,8 @@ return $e; } if (!isset($_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5])) { - return false; + $r = false; + return $r; } return $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]; } @@ -3440,7 +3451,8 @@ global $_DB_DATAOBJECT; $this->_connect(); if (!isset($_DB_DATAOBJECT['RESULTS'][$this->_DB_resultid])) { - return false; + $r = false; + return $r; } return $_DB_DATAOBJECT['RESULTS'][$this->_DB_resultid]; }