From 3600ca2ff4f33e6aca060526f3ea4c7330883a07 Mon Sep 17 00:00:00 2001
From: Martin Kamerbeek <martin@webgui-svn>
Date: Tue, 2 Mar 2004 21:33:08 +0000
Subject: [PATCH] Changed some code to let WebGUI::Navigation do less getPage
 requests.

---
 lib/WebGUI/Navigation.pm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/WebGUI/Navigation.pm b/lib/WebGUI/Navigation.pm
index a86221252..8a38b3e44 100644
--- a/lib/WebGUI/Navigation.pm
+++ b/lib/WebGUI/Navigation.pm
@@ -246,7 +246,13 @@ sub build {
 	if ($@) {
 		WebGUI::ErrorHandler::warn("Error in WebGUI::Navigation::build while trying to execute $method".$@);
 	}
-	
+
+	# Store current page properties in template var
+	my $currentPage = WebGUI::Page->getPage();
+	foreach my $property (@interestingPageProperties) {
+		$var->{'page.current.'.$property} = $currentPage->get($property);
+	}
+
 	if (@pages) {
 		my $startPageDepth = ($p->ancestors);
 		my $maxDepth = $startPageDepth + $self->{_depth};
@@ -307,9 +313,9 @@ sub build {
 			$pageData->{"page.isTop"} = ($pageData->{"page.absDepth"} == 2);
 			$pageData->{"page.hasDaughter"} = scalar($page->daughters);
 			$pageData->{"page.isMyDaughter"} = ($page->get('parentId') == 
-								WebGUI::Page->getPage()->get('pageId'));
+								$currentPage->get('pageId'));
 			$pageData->{"page.isMyMother"} = ($page->get('pageId') ==
-                                                                WebGUI::Page->getPage()->get('parentId'));
+                                                                $currentPage->get('parentId'));
 
 			# Some information about my mother
 			if(ref($page->mother)) {
@@ -329,11 +335,6 @@ sub build {
 			}
 		}
 	}
-	# Store current page properties in template var
-	my $currentPage = WebGUI::Page->getPage();
-	foreach my $property (@interestingPageProperties) {
-		$var->{'page.current.'.$property} = $currentPage->get($property);
-	}
 
 	# Configure button
 	$var->{'config.button'} = $self->_getEditButton();