From d7e43c732efe2e3b6b4827c4d2286bc03507a31c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 24 Sep 2009 17:14:04 -0400 Subject: Revert "move scripts to just before , add event for scripts that need to be in " This reverts commit a5ed805aeabab3930d066b2777dbab9663bc487f. It shouldn't have gone on the stable branch. --- lib/action.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'lib/action.php') diff --git a/lib/action.php b/lib/action.php index ebc812aca..670eb498c 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'); } -- cgit v1.2.3-54-g00ecf