diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-05-19 01:08:28 +0000 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-05-19 01:08:28 +0000 |
| commit | 4186dd2691bf4f6d0ddbf74e385dca00018747be (patch) | |
| tree | a0a60918127e426ddf1d8d3bd4535d486e0b8b51 /lib/action.php | |
| parent | 35b39342337fed5916e06876c8a37068d2052937 (diff) | |
| parent | 8c5d1b63df63bdf73ef08f8b8c46699089939fc8 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'lib/action.php')
| -rw-r--r-- | lib/action.php | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/action.php b/lib/action.php index fc123a633..6a69d2651 100644 --- a/lib/action.php +++ b/lib/action.php @@ -353,7 +353,7 @@ class Action extends HTMLOutputter // lawsuit { $this->elementStart('body', (common_current_user()) ? array('id' => $this->trimmed('action'), 'class' => 'user_in') - : array('id' => $this->trimmed('action'))); + : array('id' => $this->trimmed('action'))); $this->elementStart('div', array('id' => 'wrap')); if (Event::handle('StartShowHeader', array($this))) { $this->showHeader(); @@ -437,10 +437,10 @@ class Action extends HTMLOutputter // lawsuit _('Connect'), _('Connect to SMS, Twitter'), false, 'nav_connect'); } $this->menuItem(common_local_url('invite'), - _('Invite'), - sprintf(_('Invite friends and colleagues to join you on %s'), - common_config('site', 'name')), - false, 'nav_invitecontact'); + _('Invite'), + sprintf(_('Invite friends and colleagues to join you on %s'), + common_config('site', 'name')), + false, 'nav_invitecontact'); $this->menuItem(common_local_url('logout'), _('Logout'), _('Logout from the site'), false, 'nav_logout'); } @@ -597,7 +597,10 @@ class Action extends HTMLOutputter // lawsuit 'class' => 'system_notice')); $this->element('dt', null, _('Page notice')); $this->elementStart('dd'); - $this->showPageNotice(); + if (Event::handle('StartShowPageNotice', array($this))) { + $this->showPageNotice(); + Event::handle('EndShowPageNotice', array($this)); + } $this->elementEnd('dd'); $this->elementEnd('dl'); } @@ -635,7 +638,7 @@ class Action extends HTMLOutputter // lawsuit $this->elementStart('div', array('id' => 'aside_primary', 'class' => 'aside')); if (Event::handle('StartShowExportData', array($this))) { - $this->showExportData(); + $this->showExportData(); Event::handle('EndShowExportData', array($this)); } if (Event::handle('StartShowSections', array($this))) { |