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

[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  c240074d2392b0316ff30a8e19d711053581b676 (commit)
      from  1b3a6181e7a334f25212ea60c3ec0a90ee08ea7c (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 c240074d2392b0316ff30a8e19d711053581b676
Author: Ivan Borzenkov <iva...@li...>
Date:   Wed Aug 4 23:58:35 2010 +0400

    Исправлена ошибка сохранения путей

diff --git a/QFW/QuickFW/Router.php b/QFW/QuickFW/Router.php
index 4318313..980e5da 100644
--- a/QFW/QuickFW/Router.php
+++ b/QFW/QuickFW/Router.php
@@ -136,9 +136,6 @@ class QuickFW_Router
 
 		//Сохраняем старый путь шаблонов
 		$scriptPath = QFW::$view->getScriptPath();
-		//Выставляем новые пути вызова и сохраняем старые
-		list($lpPath, $this->ParentPath, $this->CurPath) =
-			array($this->ParentPath, $this->CurPath, $MCA['Path']);
 		//сохраняем прошлый MCA
 		list ($oModule, $oController, $oAction) =
 			array($this->cModule, $this->cController, $this->cAction);
@@ -172,9 +169,6 @@ class QuickFW_Router
 			//восстанавливаем MCA
 			list ($this->cModule, $this->cController, $this->cAction) =
 				array($oModule, $oController, $oAction);
-			//восстанавливаем пути вызова
-			list($this->CurPath, $this->ParentPath) =
-				array($this->ParentPath, $lpPath);
 			//Возвращаем путь к шаблонам после вызова
 			QFW::$view->setScriptPath($scriptPath);
 
@@ -189,14 +183,19 @@ class QuickFW_Router
 		if ($Params)
 			$MCA['Params'] = array_merge($MCA['Params'], $Params);
 
+		//Выставляем новые пути вызова и сохраняем старые
+		list($lpPath, $this->ParentPath, $this->CurPath) =
+			array($this->ParentPath, $this->CurPath, $MCA['Path']);
+
 		$result = call_user_func_array(array($MCA['Class'], $MCA['Action'].$MCA['Type']), $MCA['Params']);
 
-		//восстанавливаем MCA
-		list ($this->cModule, $this->cController, $this->cAction) =
-			array($oModule, $oController, $oAction);
 		//восстанавливаем пути вызова
 		list($this->CurPath, $this->ParentPath) =
 			array($this->ParentPath, $lpPath);
+
+		//восстанавливаем MCA
+		list ($this->cModule, $this->cController, $this->cAction) =
+			array($oModule, $oController, $oAction);
 		//Возвращаем путь к шаблонам после вызова
 		QFW::$view->setScriptPath($scriptPath);
 

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

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


hooks/post-receive
-- 
quickfw