summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-09-24 17:22:51 -0400
committerEvan Prodromou <evan@status.net>2009-09-24 17:22:51 -0400
commit78cec7ab87c005e988dbd8176585ffad9182d25c (patch)
tree735c4755433140939e6b841f971a273c6a2f76f8 /lib
parent8284b3cb82f4dec6e0f2bf74dea6e1a3bc7f4eac (diff)
parent49bce941a9aae495ee7221bd367791227487b458 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts: install.php lib/noticeform.php
Diffstat (limited to 'lib')
-rw-r--r--lib/action.php6
-rw-r--r--lib/noticeform.php2
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 {