RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 06:21:40 +03:00
Code Issues Projects Releases Wiki Activity

Browse Source
This commit is contained in:
zYne 2007-07-25 20:45:25 +00:00
parent fbe1662721
commit e60c34c735
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Doctrine/Record.php
View File

@ -742,7 +742,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
if (isset($this->_data[$lower])) {
// check if the property is null (= it is the Doctrine_Null object located in self::$_null)
if ($this->_data[$lower] === self::$_null) {
if ($this->_data[$lower] === self::$_null && $load) {
$this->load();
}
@ -824,7 +824,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
}
if ($load) {
$old = $this->get($lower, false);
$old = $this->get($lower, $load);
} else {
$old = $this->_data[$lower];
}
@ -1012,12 +1012,14 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
* @param array $array
* @return array
*/
public function getPrepared(array $array = array()) {
public function getPrepared(array $array = array())
{
$a = array();
if (empty($array)) {
$array = $this->_modified;
}
foreach ($array as $k => $v) {
$type = $this->_table->getTypeOf($v);
@ -1038,7 +1040,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
$a[$v] = $this->getTable()->getConnection()->convertBooleans($this->_data[$v]);
break;
case 'enum':
$a[$v] = $this->_table->enumIndex($v,$this->_data[$v]);
$a[$v] = $this->_table->enumIndex($v, $this->_data[$v]);
break;
default:
if ($this->_data[$v] instanceof Doctrine_Record) {