From dba325aa6156bc428f2bb8cc614f092d8a6b6752 Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Fri, 27 Nov 2015 12:21:40 +0200
Subject: [PATCH] join conditions and alias

---
 application/Espo/ORM/DB/Query/Base.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/application/Espo/ORM/DB/Query/Base.php b/application/Espo/ORM/DB/Query/Base.php
index ceca138e86..d5e9abb9bd 100644
--- a/application/Espo/ORM/DB/Query/Base.php
+++ b/application/Espo/ORM/DB/Query/Base.php
@@ -693,17 +693,20 @@ abstract class Base
     {
         $joinsArr = array();
         foreach ($joins as $relationName) {
-            $joinAlias = null;
             if (is_array($relationName)) {
                 $arr = $relationName;
                 $relationName = $arr[0];
                 if (count($arr) > 1) {
                     $joinAlias = $arr[1];
+                } else {
+                    $joinAlias = $relationName;
                 }
+            } else {
+                $joinAlias = $relationName;
             }
             $conditions = array();
-            if (!empty($joinConditions[$relationName])) {
-                $conditions = $joinConditions[$relationName];
+            if (!empty($joinConditions[$joinAlias])) {
+                $conditions = $joinConditions[$joinAlias];
             }
             if ($joinRelated = $this->getJoinRelated($entity, $relationName, $left, $conditions, $joinAlias)) {
                 $joinsArr[] = $joinRelated;