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

[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  ab01232409e00dfd269a61c7b494094e78c8a19f (commit)
      from  5614f97533c515affe96dc367b3e80eadc006d20 (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 ab01232409e00dfd269a61c7b494094e78c8a19f
Author: Ivan1986 <iva...@li...>
Date:   Tue Apr 27 17:08:35 2010 +0400

    Условие подзапросом

diff --git a/lib/Modules/Scafold/ScafoldController.php b/lib/Modules/Scafold/ScafoldController.php
index bafb53a..703174b 100644
--- a/lib/Modules/Scafold/ScafoldController.php
+++ b/lib/Modules/Scafold/ScafoldController.php
@@ -97,9 +97,9 @@ abstract class ScafoldController extends Controller
 		//Устанавливаем фильтр
 		if ($this->parentData)
 		{
-			$parent = QFW::$db->selectCol('SELECT ?# AS ARRAY_KEY, ?# FROM ?# '.$this->parentData['other'],
+			$parent = QFW::$db->selectCol('SELECT ?# AS ARRAY_KEY, ?# FROM ?# ?s',
 				$this->parentData['key'], $this->parentData['field'], 
-				$this->parentData['table']);
+				$this->parentData['table'], $this->parentData['other']);
 			$this->session();
 			if (isset($_POST['parent']))
 			{
@@ -293,10 +293,10 @@ abstract class ScafoldController extends Controller
 	 * @param string|DbSimple_SubQuery $table Главная таблица
 	 * @param string|DbSimple_SubQuery $id Ключ в главной таблице
 	 * @param string|DbSimple_SubQuery $name Заголовок в главной таблице
-	 * @param string $other Дополнительные условия
+	 * @param DbSimple_SubQuery $other Дополнительные условия
 	 * @return ScafoldController
 	 */
-	protected function parent($colum, $table, $id, $name, $other='')
+	protected function parent($colum, $table, $id, $name, $other=DBSIMPLE_SKIP)
 	{
 		$this->parentData = array(
 			'colum' => $colum,

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

Summary of changes:
 lib/Modules/Scafold/ScafoldController.php |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
quickfw