Skip to content

Y
yii2
Commit c4468ac3 by Carsten Brandt
Options

forgot to remove strtolower from __get and __unset

parent a23c54ac
Showing with 5 additions and 7 deletions
framework/yii/db/ActiveRecord.php
...@@ -379,13 +379,12 @@ class ActiveRecord extends Model ...@@ -379,13 +379,12 @@ class ActiveRecord extends Model
} elseif ($this->hasAttribute($name)) { } elseif ($this->hasAttribute($name)) {
return null; return null;
} else { } else {
$t = strtolower($name); if (isset($this->_related[$name]) || array_key_exists($name, $this->_related)) {
if (isset($this->_related[$t]) || array_key_exists($t, $this->_related)) { return $this->_related[$name];
return $this->_related[$t];
} }
$value = parent::__get($name); $value = parent::__get($name);
if ($value instanceof ActiveRelation) { if ($value instanceof ActiveRelation) {
return $this->_related[$t] = $value->multiple ? $value->all() : $value->one(); return $this->_related[$name] = $value->multiple ? $value->all() : $value->one();
} else { } else {
return $value; return $value;
} }
...@@ -433,9 +432,8 @@ class ActiveRecord extends Model ...@@ -433,9 +432,8 @@ class ActiveRecord extends Model
if ($this->hasAttribute($name)) { if ($this->hasAttribute($name)) {
unset($this->_attributes[$name]); unset($this->_attributes[$name]);
} else { } else {
$t = strtolower($name); if (isset($this->_related[$name])) {
if (isset($this->_related[$t])) { unset($this->_related[$name]);
unset($this->_related[$t]);
} else { } else {
parent::__unset($name); parent::__unset($name);
} }
......
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