Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	install.php
	lib/noticeform.php

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/action.php b/lib/action.php
index d9b5afa99..635b7c373 100644
--- 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');
     }
 
diff --git a/lib/noticeform.php b/lib/noticeform.php
index ce8f9c653..186330bf1 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -90,7 +90,7 @@ class NoticeForm extends Form
         $this->action  = $action;
         $this->content = $content;
         $this->inreplyto = $inreplyto;
-        
+
         if ($user) {
             $this->user = $user;
         } else {