Refactored ActiveQuery::one() to be consistent with all() creation

switchy · Jul 31, 2014 · fa8e576 · fa8e576
1 parent 09fc0c3
commit fa8e576
Showing 1 changed file with 2 additions and 18 deletions.
diff --git a/framework/db/ActiveQuery.php b/framework/db/ActiveQuery.php
@@ -242,24 +242,8 @@ public function one($db = null)
  {
  $row = parent::one($db);
  if ($row !== false) {
- if ($this->asArray) {
- $model = $row;
- } else {
- /* @var $class ActiveRecord */
- $class = $this->modelClass;
- $model = $class::instantiate($row);
- $class::populateRecord($model, $row);
- }
- if (!empty($this->with)) {
- $models = [$model];
- $this->findWith($this->with, $models);
- $model = $models[0];
- }
- if (!$this->asArray) {
- $model->afterFind();
- }
-
- return $model;
+ $models = $this->prepareResult([$row]);
+ return reset($models) ?: null;
  } else {
  return null;
  }