This commit is contained in:
parent
53cd5ed30b
commit
752a26cb76
@ -425,6 +425,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
|
|||||||
}
|
}
|
||||||
unset($tmp[$name]);
|
unset($tmp[$name]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $tmp;
|
return $tmp;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
@ -734,10 +735,10 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
|
|||||||
*/
|
*/
|
||||||
public function get($name, $load = true)
|
public function get($name, $load = true)
|
||||||
{
|
{
|
||||||
$value = self::$_null;
|
$value = self::$_null;
|
||||||
$lower = strtolower($name);
|
$lower = strtolower($name);
|
||||||
|
|
||||||
$lower = $this->_table->getColumnName($lower);
|
$lower = $this->_table->getColumnName($lower);
|
||||||
|
|
||||||
if (isset($this->_data[$lower])) {
|
if (isset($this->_data[$lower])) {
|
||||||
// check if the property is null (= it is the Doctrine_Null object located in self::$_null)
|
// 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) {
|
if ($this->_data[$v] instanceof Doctrine_Record) {
|
||||||
$this->_data[$v] = $this->_data[$v]->getIncremented();
|
$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];
|
$a[$v] = $this->_data[$v];
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user