diff options
author | Evan Prodromou <evan@status.net> | 2009-10-01 11:30:04 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-10-01 11:30:04 -0400 |
commit | a41ed1a66a902b078876be7528183ab61e6a3d03 (patch) | |
tree | db690c52820ebd4aefae6222cb4f3b48c2d9398f /lib/action.php | |
parent | 3449843f839b6c17618b27b031c608860761cd32 (diff) | |
parent | acc78972383c2346b5729192ab00c90c48c5b2a6 (diff) |
Merge branch '0.9.x' into schema
Diffstat (limited to 'lib/action.php')
-rw-r--r-- | lib/action.php | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lib/action.php b/lib/action.php index 8056cb9ec..71ceffe20 100644 --- a/lib/action.php +++ b/lib/action.php @@ -120,17 +120,14 @@ class Action extends HTMLOutputter // lawsuit { // XXX: attributes (profile?) $this->elementStart('head'); - if (Event::handle('StartHeadChildren', array($this))) { - $this->showTitle(); - $this->showShortcutIcon(); - $this->showStylesheets(); - $this->showScripts(); - $this->showOpenSearch(); - $this->showFeeds(); - $this->showDescription(); - $this->extraHead(); - Event::handle('EndHeadChildren', array($this)); - } + $this->showTitle(); + $this->showShortcutIcon(); + $this->showStylesheets(); + $this->showScripts(); + $this->showOpenSearch(); + $this->showFeeds(); + $this->showDescription(); + $this->extraHead(); $this->elementEnd('head'); } @@ -528,7 +525,10 @@ class Action extends HTMLOutputter // lawsuit $this->showContentBlock(); Event::handle('EndShowContentBlock', array($this)); } - $this->showAside(); + if (Event::handle('StartShowAside', array($this))) { + $this->showAside(); + Event::handle('EndShowAside', array($this)); + } $this->elementEnd('div'); } @@ -879,6 +879,7 @@ class Action extends HTMLOutputter // lawsuit */ function handle($argarray=null) { + header('Vary: Accept-Encoding,Cookie'); $lm = $this->lastModified(); $etag = $this->etag(); if ($etag) { |