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

[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  883348e1864aada2009f824c6a83ca37e9f64890 (commit)
      from  171791fb99feef38de70f67bb0223b3781685f9d (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 883348e1864aada2009f824c6a83ca37e9f64890
Author: Ivan1986 <iva...@li...>
Date:   Thu Jun 3 18:17:05 2010 +0400

    Мелкопраки роутера

diff --git a/QFW/QuickFW/Router.php b/QFW/QuickFW/Router.php
index adfef02..2d4b511 100644
--- a/QFW/QuickFW/Router.php
+++ b/QFW/QuickFW/Router.php
@@ -161,11 +161,6 @@ class QuickFW_Router
 			$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'])
@@ -174,6 +169,11 @@ class QuickFW_Router
 				$MCA['Path']."\n".$MCA['Error'];
 		}
 
+		$Params = func_get_args();
+		array_shift($Params);
+		if ($Params)
+			$MCA['Params'] = array_merge($MCA['Params'], $Params);
+
 		//сохраняем пути вызова
 		list($lpPath, $this->ParentPath, $this->CurPath) =
 			array($this->ParentPath, $this->CurPath, $MCA['Path']);
@@ -290,7 +290,7 @@ class QuickFW_Router
 		if ($ref && isset($_SERVER['HTTP_REFERER']))
 			$url = $_SERVER['HTTP_REFERER'];
 		else
-			$url = $url ? $url :  Url::site($this->RequestUri);;
+			$url = $url ? $url : Url::site($this->RequestUri);
 		header('Location: '.$url);
 		exit();
 	}
@@ -472,7 +472,7 @@ SREG;
 				$this->cAction = $this->action = $aname;
 				$this->type = $type;
 			}
-			
+
 			$this->classes[$class_key] = array(
 				'i'    => new $class,
 				'defA' => isset($vars['defA']) ? $vars['defA'] : $this->defA,

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

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


hooks/post-receive
-- 
quickfw