summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-09-24 17:24:15 -0400
committerEvan Prodromou <evan@status.net>2009-09-24 17:24:15 -0400
commit93b7e601156d88399b57ef9cd2962a22350270a8 (patch)
tree14704f5e9f6aa438ce33477a0fee1d96538c5f2f /lib
parent78cec7ab87c005e988dbd8176585ffad9182d25c (diff)
parentb5b3690eef0b9223bc5dbfd2a72de165ca8112ad (diff)
Merge branch '0.8.x' into 0.9.x
Conflicts: EVENTS.txt
Diffstat (limited to 'lib')
-rw-r--r--lib/action.php19
1 files changed, 8 insertions, 11 deletions
diff --git a/lib/action.php b/lib/action.php
index 635b7c373..02793f069 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -120,16 +120,14 @@ class Action extends HTMLOutputter // lawsuit
{
// XXX: attributes (profile?)
$this->elementStart('head');
- if (Event::handle('StartShowHeadElements', array($this))) {
- $this->showTitle();
- $this->showShortcutIcon();
- $this->showStylesheets();
- $this->showOpenSearch();
- $this->showFeeds();
- $this->showDescription();
- $this->extraHead();
- Event::handle('EndShowHeadElements', array($this));
- }
+ $this->showTitle();
+ $this->showShortcutIcon();
+ $this->showStylesheets();
+ $this->showScripts();
+ $this->showOpenSearch();
+ $this->showFeeds();
+ $this->showDescription();
+ $this->extraHead();
$this->elementEnd('head');
}
@@ -354,7 +352,6 @@ class Action extends HTMLOutputter // lawsuit
Event::handle('EndShowFooter', array($this));
}
$this->elementEnd('div');
- $this->showScripts();
$this->elementEnd('body');
}