Some UI adjustments for form notice

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

diff --git a/lib/action.php b/lib/action.php
index 8056cb9ecb375f92d7a0e1235027f6e5f2a37575..1b2f7375211364561a9f05409d55758294b5c325 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -120,16 +120,15 @@ class Action extends HTMLOutputter // lawsuit
     {
         // XXX: attributes (profile?)
         $this->elementStart('head');
-        if (Event::handle('StartHeadChildren', array($this))) {
+        if (Event::handle('StartShowHeadElements', array($this))) {
             $this->showTitle();
             $this->showShortcutIcon();
             $this->showStylesheets();
-            $this->showScripts();
             $this->showOpenSearch();
             $this->showFeeds();
             $this->showDescription();
             $this->extraHead();
-            Event::handle('EndHeadChildren', array($this));
+            Event::handle('EndShowHeadElements', array($this));
         }
         $this->elementEnd('head');
     }
@@ -355,6 +354,7 @@ class Action extends HTMLOutputter // lawsuit
             Event::handle('EndShowFooter', array($this));
         }
         $this->elementEnd('div');
+        $this->showScripts();
         $this->elementEnd('body');
     }
 
@@ -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');
     }
 
@@ -879,6 +882,7 @@ class Action extends HTMLOutputter // lawsuit
      */
     function handle($argarray=null)
     {
+        header('Vary: Accept-Encoding,Cookie');
         $lm   = $this->lastModified();
         $etag = $this->etag();
         if ($etag) {