This commit is contained in:
parent
fbe1662721
commit
e60c34c735
@ -742,7 +742,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
|
|||||||
|
|
||||||
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)
|
||||||
if ($this->_data[$lower] === self::$_null) {
|
if ($this->_data[$lower] === self::$_null && $load) {
|
||||||
$this->load();
|
$this->load();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -824,7 +824,7 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($load) {
|
if ($load) {
|
||||||
$old = $this->get($lower, false);
|
$old = $this->get($lower, $load);
|
||||||
} else {
|
} else {
|
||||||
$old = $this->_data[$lower];
|
$old = $this->_data[$lower];
|
||||||
}
|
}
|
||||||
@ -1012,12 +1012,14 @@ abstract class Doctrine_Record extends Doctrine_Record_Abstract implements Count
|
|||||||
* @param array $array
|
* @param array $array
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function getPrepared(array $array = array()) {
|
public function getPrepared(array $array = array())
|
||||||
|
{
|
||||||
$a = array();
|
$a = array();
|
||||||
|
|
||||||
if (empty($array)) {
|
if (empty($array)) {
|
||||||
$array = $this->_modified;
|
$array = $this->_modified;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($array as $k => $v) {
|
foreach ($array as $k => $v) {
|
||||||
$type = $this->_table->getTypeOf($v);
|
$type = $this->_table->getTypeOf($v);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user