Skip to content

S
syncEnrollments
Commit c4ece2d5 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

rearrange __get hierarchy so eloquent models can have methods that have the same name as columns.

parent 695420c1
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
system/db/eloquent/model.php
View file @ c4ece2d5
...@@ -424,9 +424,13 @@ abstract class Model { ...@@ -424,9 +424,13 @@ abstract class Model {
*/ */
public function __get($key) public function __get($key)
{ {
if (array_key_exists($key, $this->attributes))
{
return $this->attributes[$key];
}
// Is the requested item a model relationship that has already been loaded? // Is the requested item a model relationship that has already been loaded?
// All of the loaded relationships are stored in the "ignore" array. // All of the loaded relationships are stored in the "ignore" array.
if (array_key_exists($key, $this->ignore)) elseif (array_key_exists($key, $this->ignore))
{ {
return $this->ignore[$key]; return $this->ignore[$key];
} }
...@@ -438,10 +442,6 @@ abstract class Model { ...@@ -438,10 +442,6 @@ abstract class Model {
return $this->ignore[$key] = (in_array($this->relating, array('has_one', 'belongs_to'))) ? $query->first() : $query->get(); return $this->ignore[$key] = (in_array($this->relating, array('has_one', 'belongs_to'))) ? $query->first() : $query->get();
} }
elseif (array_key_exists($key, $this->attributes))
{
return $this->attributes[$key];
}
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment