summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-01-15 14:45:08 -0500
committerEvan Prodromou <evan@controlyourself.ca>2009-01-15 14:45:08 -0500
commit7e316abe92d6cabfe626e0fbe747e783e9752085 (patch)
tree5b9259ffdd602e345960d1ccbac8f763ed81ad77
parent87120106721a079e3b45baa918f379fa7c9cf361 (diff)
Move optional id param to end of function, where optional params
actually go.
-rw-r--r--lib/action.php25
1 files changed, 6 insertions, 19 deletions
diff --git a/lib/action.php b/lib/action.php
index 7c919497f..634b3bfa3 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -290,25 +290,11 @@ class Action extends HTMLOutputter // lawsuit
$this->elementEnd('div');
}
- // SHOULD overload (perhaps this should be a MUST because sometimes it is not used)
+ // SHOULD overload
- function showLocalNav($menu)
+ function showLocalNav()
{
- $action = $this->trimmed('action');
-
- $this->elementStart('dl', array('id' => 'site_nav_local_views'));
- $this->element('dt', null, _('Local views'));
- $this->elementStart('ul', array('id' => 'nav'));
- 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');
- $this->elementEnd('dd');
- $this->elementEnd('dl');
+ // does nothing by default
}
function showContentBlock()
@@ -577,9 +563,10 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('div', array('id' => 'content'));
}
- // Added @id to li for some control. We might want to move this to htmloutputter.php
+ // Added @id to li for some control.
+ // XXX: We might want to move this to htmloutputter.php
- function menuItem($id=null, $url, $text, $title=null, $is_selected=false)
+ function menuItem($url, $text, $id=null, $title=null, $is_selected=false)
{
$lattrs = array();
if ($is_selected) {