ActiveQuery::one() slight refactoring
Merge pull request #3658 from creocoder/activequery-one-refactoring

ActiveQuery::one() slight refactoring