summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/action.php39
1 files changed, 1 insertions, 38 deletions
diff --git a/lib/action.php b/lib/action.php
index 2a8f5677c..ed8b5c352 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -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