RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-29 19:41:45 +03:00
Code Issues Projects Releases Wiki Activity

Browse Source
This commit is contained in:
zYne 2007-07-23 18:27:00 +00:00
parent 53cd5ed30b
commit 752a26cb76
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Doctrine/Record.php
View File

@ -425,6 +425,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
}
unset($tmp[$name]);
}
return $tmp;
}
/**
@ -734,10 +735,10 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
*/
public function get($name, $load = true)
{
$value = self::$_null;
$lower = strtolower($name);
$value = self::$_null;
$lower = strtolower($name);
$lower = $this->_table->getColumnName($lower);
$lower = $this->_table->getColumnName($lower);
if (isset($this->_data[$lower])) {
// check if the property is null (= it is the Doctrine_Null object located in self::$_null)
@ -1043,6 +1044,10 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
if ($this->_data[$v] instanceof Doctrine_Record) {
$this->_data[$v] = $this->_data[$v]->getIncremented();
}
if ($this->_data[$v] === null) {
throw new Doctrine_Record_Exception('Unexpected null value.');
}
$a[$v] = $this->_data[$v];
}