fixbug
Merge branch 'yii'