Merge branch '0.8.x' into 0.9.x

[quix0rs-gnu-social.git] / lib / action.php

diff --git a/lib/action.php b/lib/action.php
index 635b7c3733186fa92a922baf979975a20dd212ac..1b2f7375211364561a9f05409d55758294b5c325 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -528,7 +528,10 @@ class Action extends HTMLOutputter // lawsuit
             $this->showContentBlock();
             Event::handle('EndShowContentBlock', array($this));
         }
-        $this->showAside();
+        if (Event::handle('StartShowAside', array($this))) {
+            $this->showAside();
+            Event::handle('EndShowAside', array($this));
+        }
         $this->elementEnd('div');
     }