From 42c37321d9d1e6e2ad7e65584d2183ed687a049d Mon Sep 17 00:00:00 2001
From: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date: Thu, 27 Mar 2014 17:14:57 +0100
Subject: [PATCH] Nitpicks

---
 src/ORM/Association/BelongsToMany.php            | 3 +--
 src/ORM/Association/ExternalAssociationTrait.php | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ORM/Association/BelongsToMany.php b/src/ORM/Association/BelongsToMany.php
index 8fac40d3454..e5a51772489 100644
--- a/src/ORM/Association/BelongsToMany.php
+++ b/src/ORM/Association/BelongsToMany.php
@@ -257,8 +257,7 @@ public function transformRow($row, $joined) {
 			$row[$this->target()->alias()][$this->_junctionProperty] = $row[$alias];
 			unset($row[$alias]);
 		}
-		$row = $this->_transformRow($row, $joined);
-		return $row;
+		return $this->_transformRow($row, $joined);
 	}
 
 /**
diff --git a/src/ORM/Association/ExternalAssociationTrait.php b/src/ORM/Association/ExternalAssociationTrait.php
index 68fba6bd7e4..dae0a0479f0 100644
--- a/src/ORM/Association/ExternalAssociationTrait.php
+++ b/src/ORM/Association/ExternalAssociationTrait.php
@@ -99,8 +99,9 @@ public function transformRow($row, $joined) {
 		$sourceAlias = $this->source()->alias();
 		$targetAlias = $this->target()->alias();
 
-		if (isset($row[$this->_name . '___collection_'])) {
-			$values = $row[$this->_name . '___collection_'];
+		$collectionAlias = $this->_name . '___collection_';
+		if (isset($row[$collectionAlias])) {
+			$values = $row[$collectionAlias];
 		} else {
 			$values = $row[$this->_name];
 		}