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

Merge remote branch 'origin/1.0.x' into 1.0.x

Browse Source
This commit is contained in:
Samantha Doherty 2011-06-09 20:24:09 -04:00
commit d43e977195
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/action.php
View File

@ -1352,13 +1352,16 @@ class Action extends HTMLOutputter // lawsuit
// Added @id to li for some control. // Added @id to li for some control.
// XXX: We might want to move this to htmloutputter.php // XXX: We might want to move this to htmloutputter.php
$lattrs = array(); $lattrs = array();
$classes = array();
if ($class !== null) { if ($class !== null) {
$lattrs['class'] = $class; $classes[] = trim($class);
}
if ($is_selected) { if ($is_selected) {
$lattrs['class'] = trim('current ' . $lattrs['class']); $classes[] = 'current';
}
} }
$lattrs['class'] = implode(' ', $classes);
(is_null($id)) ? $lattrs : $lattrs['id'] = $id; (is_null($id)) ? $lattrs : $lattrs['id'] = $id;
$this->elementStart('li', $lattrs); $this->elementStart('li', $lattrs);