forked from GNUsocial/gnu-social
Merge remote branch 'origin/1.0.x' into 1.0.x
This commit is contained in:
commit
d43e977195
@ -1351,13 +1351,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) {
|
|
||||||
$lattrs['class'] = trim('current ' . $lattrs['class']);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
if ($is_selected) {
|
||||||
|
$classes[] = 'current';
|
||||||
|
}
|
||||||
|
|
||||||
|
$lattrs['class'] = implode(' ', $classes);
|
||||||
|
|
||||||
(is_null($id)) ? $lattrs : $lattrs['id'] = $id;
|
(is_null($id)) ? $lattrs : $lattrs['id'] = $id;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user