Browse Source

Merge pull request #737 from wicaksono/master

Use `hasAttribute()` instead to avoid code duplication
tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
dedad2487d
  1. 4
      framework/yii/db/ActiveRecord.php

4
framework/yii/db/ActiveRecord.php

@ -399,7 +399,7 @@ class ActiveRecord extends Model
*/
public function __set($name, $value)
{
if (isset($this->_attributes[$name]) || isset($this->getTableSchema()->columns[$name])) {
if ($this->hasAttribute($name)) {
$this->_attributes[$name] = $value;
} else {
parent::__set($name, $value);
@ -562,7 +562,7 @@ class ActiveRecord extends Model
*/
public function setAttribute($name, $value)
{
if (isset($this->_attributes[$name]) || isset($this->getTableSchema()->columns[$name])) {
if ($this->hasAttribute($name)) {
$this->_attributes[$name] = $value;
} else {
throw new InvalidParamException(get_class($this) . ' has no attribute named "' . $name . '".');

Loading…
Cancel
Save