Merge pull request #1276 from rk/rk-issue-1261

[#1261] get_key now pulls from $original instead
This commit is contained in:
Taylor Otwell
2012-09-25 18:31:34 -07:00

View File

@@ -544,7 +544,7 @@ abstract class Model {
*/ */
public function get_key() public function get_key()
{ {
return $this->get_attribute(static::$key); return array_get($this->original, static::$key);
} }
/** /**
@@ -721,7 +721,7 @@ abstract class Model {
{ {
if (array_key_exists($key, $this->$source)) return true; if (array_key_exists($key, $this->$source)) return true;
} }
if (method_exists($this, $key)) return true; if (method_exists($this, $key)) return true;
} }