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

[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  f19729b58a64fb8f392ef5064bc2353d8fd7010a (commit)
      from  b92c178fa206f6cd2eaf4cf26a0a318f0e079cbd (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 f19729b58a64fb8f392ef5064bc2353d8fd7010a
Author: Ivan1986 <iva...@li...>
Date:   Mon May 24 17:22:23 2010 +0400

    Исправлена ошибка с текущем урлом в Nav хелпере

diff --git a/application/helper/controllers/NavController.php b/application/helper/controllers/NavController.php
index d32e38c..7b0c95f 100644
--- a/application/helper/controllers/NavController.php
+++ b/application/helper/controllers/NavController.php
@@ -49,10 +49,14 @@ class NavController
 			$result.='<li>';
 			if ($v === false)
 				$result.=$k;
-			elseif ($cur == $v)
-				$result.='<b>'.$k.'</b>';
 			else
-				$result.='<a href="'.$v.'">'.$k.'</a>';
+			{
+				if ($v instanceof Url)
+					$self = $cur == $v->intern();
+				else
+					$self = $cur == $v;
+				$result.= $self ? '<b>'.$k.'</b>' : '<a href="'.$v.'">'.$k.'</a>';
+			}
 			$result.="</li>\n";
 		}
 		$result.= '</ul>';

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

Summary of changes:
 application/helper/controllers/NavController.php |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
quickfw