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

[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  171791fb99feef38de70f67bb0223b3781685f9d (commit)
      from  87a14bd519095238326b0fe3bd412e827c0b79e0 (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 171791fb99feef38de70f67bb0223b3781685f9d
Author: Ivan1986 <iva...@li...>
Date:   Wed Jun 2 14:44:24 2010 +0400

    Исправлена ошибка в роутере - параметры в блоке

diff --git a/QFW/QuickFW/Router.php b/QFW/QuickFW/Router.php
index b00f72f..adfef02 100644
--- a/QFW/QuickFW/Router.php
+++ b/QFW/QuickFW/Router.php
@@ -146,16 +146,9 @@ class QuickFW_Router
 		{
 			$data = array_slice($patt,1,3);
 			$MCA = $this->loadMCA($data,'Block');
-			if (isset($patt[4]))
-			{
-				// Если вы все еще сидите на PHP 5.2 то раскомментируйте старый вариант
-				$MCA['Params'] = str_getcsv($patt[4],',',"'",'\\'); // $this->parseScobParams($patt[4]);
-			}
-			else
-			{
-				$MCA['Params'] = func_get_args();
-				array_shift($MCA['Params']);
-			}
+			// Если вы все еще сидите на PHP 5.2 то раскомментируйте старый вариант
+			$MCA['Params'] = empty($patt[4]) ? array() :
+				$this->parseScobParams($patt[4]); // str_getcsv($patt[4],',',"'",'\\');
 		}
 		else
 		{
@@ -165,8 +158,14 @@ class QuickFW_Router
 			// module/controller/action/p1/p2/p3/...
 			$data = explode(self::PATH_SEPARATOR, $Uri);
 			$MCA = $this->loadMCA($data,'Block');
-			$MCA['Params']=$this->parseParams($data);
+			$MCA['Params'] = $this->parseParams($data);
 		}
+
+		$Params = func_get_args();
+		array_shift($Params);
+		if ($Params)
+			$MCA['Params'] = array_merge($MCA['Params'], $Params);
+
 		if (isset($MCA['Error']))
 		{
 			if (QFW::$config['QFW']['release'])

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

Summary of changes:
 QFW/QuickFW/Router.php |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
quickfw