diff options
| author | Evan Prodromou <evan@status.net> | 2009-09-24 17:14:04 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-09-24 17:14:04 -0400 |
| commit | d7e43c732efe2e3b6b4827c4d2286bc03507a31c (patch) | |
| tree | f07ca837666ba940e4833080a31282bfb20d4dee | |
| parent | a5ed805aeabab3930d066b2777dbab9663bc487f (diff) | |
Revert "move scripts to just before </body>, add event for scripts that need to be in <head>"
This reverts commit a5ed805aeabab3930d066b2777dbab9663bc487f.
It shouldn't have gone on the stable branch.
| -rw-r--r-- | EVENTS.txt | 6 | ||||
| -rw-r--r-- | lib/action.php | 19 |
2 files changed, 8 insertions, 17 deletions
diff --git a/EVENTS.txt b/EVENTS.txt index dfaf34a66..68cb28603 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -134,9 +134,3 @@ StartAddressData: Allows the site owner to provide additional information about EndAddressData: At the end of <address> - $action: the current action - -StartShowHeadElements: Right after the <head> tag -- $action: the current action - -EndShowHeadElements: Right before the </head> tag; put <script>s here if you need them in <head> -- $action: the current action 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'); } |