forked from GNUsocial/gnu-social
Fix errant } in action
This commit is contained in:
parent
ba9f1f603b
commit
a22714b5ee
@ -331,11 +331,10 @@ class Action extends HTMLOutputter // lawsuit
|
||||
$this->elementStart('dl', array('id' => 'page_notice',
|
||||
'class' => 'system_notice'));
|
||||
$this->element('dt', null, _('Page notice'));
|
||||
$this->elementStart('dd', null);
|
||||
$this->elementStart('dd');
|
||||
$this->showPageNotice();
|
||||
$this->elementEnd('dd');
|
||||
$this->elementEnd('dl');
|
||||
}
|
||||
}
|
||||
|
||||
// SHOULD overload (unless there's not a notice)
|
||||
@ -554,42 +553,6 @@ class Action extends HTMLOutputter // lawsuit
|
||||
return common_local_url($action, $args);
|
||||
}
|
||||
|
||||
function nav_menu($menu)
|
||||
{
|
||||
$action = $this->trimmed('action');
|
||||
$this->elementStart('ul', array('id' => 'nav_views'));
|
||||
foreach ($menu as $menuaction => $menudesc) {
|
||||
$this->menuItem(common_local_url($menuaction,
|
||||
isset($menudesc[2]) ? $menudesc[2] : null),
|
||||
$menudesc[0],
|
||||
$menudesc[1],
|
||||
$action == $menuaction);
|
||||
}
|
||||
$this->elementEnd('ul');
|
||||
}
|
||||
|
||||
function common_show_header($pagetitle, $callable=null, $data=null, $headercall=null)
|
||||
{
|
||||
global $config, $xw;
|
||||
global $action; /* XXX: kind of cheating here. */
|
||||
|
||||
common_start_html();
|
||||
|
||||
$this->elementStart('head');
|
||||
|
||||
if ($callable) {
|
||||
if ($data) {
|
||||
call_user_func($callable, $data);
|
||||
} else {
|
||||
call_user_func($callable);
|
||||
}
|
||||
}
|
||||
$this->elementEnd('head');
|
||||
$this->elementStart('body', $action);
|
||||
$this->elementStart('div', array('id' => 'wrap'));
|
||||
$this->elementStart('div', array('id' => 'content'));
|
||||
}
|
||||
|
||||
// Added @id to li for some control.
|
||||
// XXX: We might want to move this to htmloutputter.php
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user