ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Chris Berthe
2012-07-12 11:15:43 -04:00
parent 3b6191ec16 1503aed7ce
commit b325e954e3
25 changed files with 538 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
laravel/database/eloquent/model.php
View File

@@ -218,9 +218,11 @@ abstract class Model {
{
$model = new static(array(), true);
if (static::$timestamps) $attributes['updated_at'] = new \DateTime;
$model->fill($attributes);
return $model->query()->where($model->key(), '=', $id)->update($attributes);
if (static::$timestamps) $model->timestamp();
return $model->query()->where($model->key(), '=', $id)->update($model->attributes);
}
/**
@@ -500,7 +502,7 @@ abstract class Model {
*/
public function changed($attribute)
{
return array_get($this->attributes, $attribute) !== array_get($this->original, $attribute);
return array_get($this->attributes, $attribute) != array_get($this->original, $attribute);
}
/**
@@ -536,7 +538,7 @@ abstract class Model {
foreach ($this->attributes as $key => $value)
{
if ( ! isset($this->original[$key]) or $value !== $this->original[$key])
if ( ! array_key_exists($key, $this->original) or $value !== $this->original[$key])
{
$dirty[$key] = $value;
}
@@ -725,7 +727,7 @@ abstract class Model {
{
foreach (array('attributes', 'relationships') as $source)
{
if (array_key_exists($key, $this->$source)) return true;
if (array_key_exists($key, $this->$source)) return !is_null($this->$source[$key]);
}
if (method_exists($this, $key)) return true;