wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes Ticket #1607 - empty 'page-notice' definition lists were

Browse Source 
being output in a bunch of places.
This commit is contained in:
Zach Copley 2009-06-12 17:06:42 -07:00
parent 79fa050125
commit 89d0583b91
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/action.php
View File

@ -575,20 +575,32 @@ class Action extends HTMLOutputter // lawsuit
/** /**
* Show page notice block. * Show page notice block.
* *
* Only show the block if a subclassed action has overrided
* Action::showPageNotice(), or an event handler is registered for
* the StartShowPageNotice event, in which case we assume the
* 'page_notice' definition list is desired. This is to prevent
* empty 'page_notice' definition lists from being output everywhere.
*
* @return nothing * @return nothing
*/ */
function showPageNoticeBlock() function showPageNoticeBlock()
{ {
$this->elementStart('dl', array('id' => 'page_notice', $rmethod = new ReflectionMethod($this, 'showPageNotice');
'class' => 'system_notice')); $dclass = $rmethod->getDeclaringClass()->getName();
$this->element('dt', null, _('Page notice'));
$this->elementStart('dd'); if ($dclass != 'Action' || Event::hasHandler('StartShowPageNotice')) {
if (Event::handle('StartShowPageNotice', array($this))) {
$this->showPageNotice(); $this->elementStart('dl', array('id' => 'page_notice',
Event::handle('EndShowPageNotice', array($this)); 'class' => 'system_notice'));
$this->element('dt', null, _('Page notice'));
$this->elementStart('dd');
if (Event::handle('StartShowPageNotice', array($this))) {
$this->showPageNotice();
Event::handle('EndShowPageNotice', array($this));
}
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
$this->elementEnd('dd');
$this->elementEnd('dl');
} }
/** /**