Fixed a via query bug.

framework/db/ActiveRelation.php

@@ -49,21 +49,17 @@ class ActiveRelation extends ActiveQuery
 
 	/**
 	 * @param string $relationName
-	 * @param array|\Closure $options
+	 * @param callback $callback
 	 * @return ActiveRelation
 	 */
-	public function via($relationName, $options = null)
+	public function via($relationName, $callback = null)
 	{
 		/** @var $relation ActiveRelation */
 		$relation = $this->primaryModel->$relationName();
 		$relation->primaryModel = null;
 		$this->via = array($relationName, $relation);
-		if (is_array($options)) {
+		if ($callback !== null) {
-			foreach ($options as $name => $value) {
+			call_user_func($callback, $relation);
-				$this->$name = $value;
-			}
-		} elseif ($options instanceof \Closure) {
-			$options($relation);
 		}
 		return $this;
 	}
@@ -71,10 +67,10 @@ class ActiveRelation extends ActiveQuery
 	/**
 	 * @param string $tableName
 	 * @param array $link
-	 * @param array|\Closure $options
+	 * @param callback $callback
 	 * @return ActiveRelation
 	 */
-	public function viaTable($tableName, $link, $options = null)
+	public function viaTable($tableName, $link, $callback = null)
 	{
 		$relation = new ActiveRelation(array(
 			'modelClass' => get_class($this->primaryModel),
@@ -84,12 +80,8 @@ class ActiveRelation extends ActiveQuery
 			'asArray' => true,
 		));
 		$this->via = $relation;
-		if (is_array($options)) {
+		if ($callback !== null) {
-			foreach ($options as $name => $value) {
+			call_user_func($callback, $relation);
-				$this->$name = $value;
-			}
-		} elseif ($options instanceof \Closure) {
-			$options($relation);
 		}
 		return $this;
 	}
@@ -110,12 +102,14 @@ class ActiveRelation extends ActiveQuery
 				$this->filterByModels($viaModels);
 			} elseif (is_array($this->via)) {
 				// via relation
-				$relationName = $this->via[0];
+				/** @var $viaQuery ActiveRelation */
-				$viaModels = $this->primaryModel->$relationName;
+				list($viaName, $viaQuery) = $this->via;
-				if ($viaModels === null) {
+				$viaQuery->primaryModel = $this->primaryModel;
-					$viaModels = array();
+				if ($viaQuery->multiple) {
-				} elseif (!is_array($viaModels)) {
+					$this->primaryModel->$viaName = $viaModels = $viaQuery->all();
-					$viaModels = array($viaModels);
+				} else {
+					$this->primaryModel->$viaName = $model = $viaQuery->one();
+					$viaModels = $model === null ? array() : array($model);
 				}
 				$this->filterByModels($viaModels);
 			} else {