From 042b01d169bc26444e1150c8a01dd0f5bb9d2f4f Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 17:04:59 +0000
Subject: Extracted the showLocalNav block information into its own method in
 order to override it from other actions. This HTML need not be outputted if
 there is no page_notice.

---
 lib/action.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'lib/action.php')

diff --git a/lib/action.php b/lib/action.php
index c056c128f..d385c3cb5 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -301,15 +301,20 @@ class Action extends HTMLOutputter // lawsuit
     function showCore()
     {
         $this->elementStart('div', array('id' => 'core'));
+        $this->showLocalNavBlock();
+        $this->elementEnd('dl');
+        $this->showContentBlock();
+        $this->showAside();
+        $this->elementEnd('div');
+    }
+
+    function showLocalNavBlock()
+    {
         $this->elementStart('dl', array('id' => 'site_nav_local_views'));
         $this->element('dt', null, _('Local views'));
         $this->elementStart('dd');
         $this->showLocalNav();
         $this->elementEnd('dd');
-        $this->elementEnd('dl');
-        $this->showContentBlock();
-        $this->showAside();
-        $this->elementEnd('div');
     }
 
     // SHOULD overload
-- 
cgit v1.2.3-54-g00ecf