[Quickfw-git] SF.net Git: quickfw branch, master, updated. d8ae62b53971e4e59359059f22754f2beefff373

[Ivan1986 <iva...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".

The branch, master has been updated
       via  d8ae62b53971e4e59359059f22754f2beefff373 (commit)
      from  5fa1d8f23e0ec33fe521dd60bfd5c97604f9d6b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d8ae62b53971e4e59359059f22754f2beefff373
Author: Ivan Borzenkov <iva...@li...>
Date:   Wed Jan 26 13:04:09 2011 +0300

    Исправлена ошибка при совпадающих полях в связанной таблице

diff --git a/lib/Modules/Scaffold/ScaffoldController.php b/lib/Modules/Scaffold/ScaffoldController.php
index 7582a3c..f10a049 100644
--- a/lib/Modules/Scaffold/ScaffoldController.php
+++ b/lib/Modules/Scaffold/ScaffoldController.php
@@ -274,7 +274,7 @@ abstract class ScaffoldController extends Controller
 		$foreign = $this->getForeign();
 		$data = QFW::$db->select('SELECT ?# AS ARRAY_KEY, ?# ?s FROM ?# ?s
 			WHERE ?s ?s '.$this->where.' ?s LIMIT ?d, ?d',
-			$this->primaryKey, array($this->table=>array_merge($this->order, array('*'))),
+			array($this->table=>$this->primaryKey), array($this->table=>array_merge($this->order, array('*'))),
 			$foreign['field'], $this->table, $foreign['join'],
 			$filter['where'], $parentWhere,
 			$this->getSort(),

-----------------------------------------------------------------------

Summary of changes:
 lib/Modules/Scaffold/ScaffoldController.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
quickfw