Merge branch 'master' of /var/www/trunk

1 files changed, 8 insertions, 3 deletions

diff --git a/lib/action.php b/lib/action.php
index c056c128f..5987abf3c 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->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