diff options
| author | Craig Andrews <candrews@integralblue.com> | 2009-09-24 17:15:54 -0400 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2009-09-24 17:15:54 -0400 |
| commit | 49bce941a9aae495ee7221bd367791227487b458 (patch) | |
| tree | 91858ee586473045158f6bb539e26af8168ecd84 /EVENTS.txt | |
| parent | 3d30ad83f881a69d76b57a9af051fef308644987 (diff) | |
| parent | 5323956e388ebc2e4dfa1a5193aa670c96fff027 (diff) | |
Merge remote branch 'statusnet/0.8.x' into 0.9.x
Conflicts:
EVENTS.txt
actions/requesttoken.php
classes/File.php
install.php
lib/action.php
lib/noticeform.php
Diffstat (limited to 'EVENTS.txt')
| -rw-r--r-- | EVENTS.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/EVENTS.txt b/EVENTS.txt index 2b16d43c0..fa25aabcd 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -170,12 +170,6 @@ StartShowBody: called before showing the <body> element and children EndShowBody: called after showing the <body> element (and </body>) - $action: action object being shown -StartHeadChildren: called before showing the children of <head> element (after <head> tag) -- $action: action object being shown - -EndHeadChildren: called after showing the children of <head> element (before </head>) -- $action: action object being shown - StartPersonalGroupNav: beginning of personal group nav menu - $action: action object being shown @@ -271,3 +265,9 @@ GetValidDaemons: Just before determining which daemons to run HandleQueuedNotice: Handle a queued notice at queue time (or immediately if no queue) - &$notice: notice to handle + +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 |