From b25127181a68a658002849d07846535303104ed3 Mon Sep 17 00:00:00 2001
From: kirsan <rus.engine@gmail.com>
Date: Tue, 19 Apr 2011 12:49:13 +0000
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=B4=D0=BD=D0=BE=D0=B2=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=82=D1=8B=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=B8=20#where=20(http://trac.lsdev.ru/livestreet/tic?=
 =?UTF-8?q?ket/197)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 engine/classes/MapperORM.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/engine/classes/MapperORM.class.php b/engine/classes/MapperORM.class.php
index 75704847..d392a564 100644
--- a/engine/classes/MapperORM.class.php
+++ b/engine/classes/MapperORM.class.php
@@ -138,13 +138,6 @@ class MapperORM extends Mapper {
 	
 	
 	public function BuildFilter($aFilter,$oEntitySample) {
-		if (isset($aFilter['#where']) and is_array($aFilter['#where'])) {
-			// '#where' => array('id = ?d OR name = ?' => array(1,'admin'));
-			foreach ($aFilter['#where'] as $sFilterFields => $aValues) {
-				return array($aValues,' and '. trim($sFilterFields) .' '); // возвращает первый элемент
-			}			
-		}
-
 		$aFilterFields=array();
 		foreach ($aFilter as $k=>$v) {
 			if (substr($k,0,1)=='#' || (is_string($v) && substr($v,0,1)=='#')) {
@@ -168,6 +161,13 @@ class MapperORM extends Mapper {
 				$sFilterFields.=" and {$sFieldCurrent} {$sConditionCurrent} ? ";
 			}
 		}
+        if (isset($aFilter['#where']) and is_array($aFilter['#where'])) {
+            // '#where' => array('id = ?d OR name = ?' => array(1,'admin'));
+            foreach ($aFilter['#where'] as $sFilterKey => $aValues) {
+                $aFilterFields = array_merge($aFilterFields, $aValues);
+                $sFilterFields .= ' and '. trim($sFilterKey) .' ';
+			}
+		}
 		return array($aFilterFields,$sFilterFields);
 	}