cvs: pear /DB_DataObject DataObject.php
| From: | Alan Knowles | Date: | Wed, 20 Apr 2005 07:46:45 +0000 |
| Subject: | cvs: pear /DB_DataObject DataObject.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-31312@lists.php.net to get a copy of this message | ||
alan_k Wed Apr 20 03:46:45 2005 EDT
Modified files:
/pear/DB_DataObject DataObject.php
Log:
fix bug #4040 - prevent toArray from calling getLink and getLinks - bad choice of names...
http://cvs.php.net/diff.php/pear/DB_DataObject/DataObject.php?r1=1.351&r2=1.352&ty=u
Index: pear/DB_DataObject/DataObject.php
diff -u pear/DB_DataObject/DataObject.php:1.351 pear/DB_DataObject/DataObject.php:1.352
--- pear/DB_DataObject/DataObject.php:1.351 Wed Apr 20 03:41:38 2005
+++ pear/DB_DataObject/DataObject.php Wed Apr 20 03:46:44 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.351 2005/04/20 07:41:38 alan_k Exp $
+ * @version CVS: $Id: DataObject.php,v 1.352 2005/04/20 07:46:44 alan_k Exp $
* @link http://pear.php.net/package/DB_DataObject
*/
@@ -3179,8 +3179,8 @@
$ret[sprintf($format,$k)] = '';
continue;
}
- // call the overloaded getXXXX() method.
- if (method_exists($this,'get'.$k)) {
+ // call the overloaded getXXXX() method. - except getLink and getLinks
+ if (method_exists($this,'get'.$k) &&
!in_array(strtolower($k),array('links','link'))) {
$ret[sprintf($format,$k)] = $this->{'get'.$k}();
continue;
}