Merge commit 'bdce87b242abbff800020deba0a5c2031fc2efe7' into feature-restapi

Conflicts:
	framework/db/BaseActiveRecord.php
This commit is contained in:
Qiang Xue
2014-03-06 00:00:33 -05:00
127 changed files with 581 additions and 1169 deletions

View File

@ -175,6 +175,7 @@ class User extends Component
public function setIdentity($identity)
{
$this->_identity = $identity;
$this->_access = [];
}
/**