Move object menu into aside

diff --git a/lib/action.php b/lib/action.php
index 28b0fdbacfb6bfcd5c2b0c2e1e87cb09bf1538d1..92be43ba68bb1edf7410aff124a3e91b7691afd1 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -669,10 +669,6 @@ class Action extends HTMLOutputter // lawsuit
             $this->showContentBlock();
             Event::handle('EndShowContentBlock', array($this));
         }
-        if (Event::handle('StartShowObjectNavBlock', array($this))) {
-            $this->showObjectNavBlock();
-            Event::handle('EndShowObjectNavBlock', array($this));
-        }
         if (Event::handle('StartShowAside', array($this))) {
             $this->showAside();
             Event::handle('EndShowAside', array($this));
@@ -828,6 +824,10 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->elementStart('div', array('id' => 'aside_primary',
                                          'class' => 'aside'));
+        if (Event::handle('StartShowObjectNavBlock', array($this))) {
+            $this->showObjectNavBlock();
+            Event::handle('EndShowObjectNavBlock', array($this));
+        }
         if (Event::handle('StartShowSections', array($this))) {
             $this->showSections();
             Event::handle('EndShowSections', array($this));