From 1f86f45bb9e349f23a000319b2cac19759c0b218 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Mar 2011 10:38:44 -0800
Subject: [PATCH] Move object menu into aside

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

diff --git a/lib/action.php b/lib/action.php
index 28b0fdbacf..92be43ba68 100644
--- 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));