Commit d43e9771 authored by Samantha Doherty's avatar Samantha Doherty

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

parents 87c83de6 e1ac64f2
......@@ -1351,14 +1351,17 @@ class Action extends HTMLOutputter // lawsuit
{
// Added @id to li for some control.
// XXX: We might want to move this to htmloutputter.php
$lattrs = array();
$lattrs = array();
$classes = array();
if ($class !== null) {
$lattrs['class'] = $class;
if ($is_selected) {
$lattrs['class'] = trim('current ' . $lattrs['class']);
}
$classes[] = trim($class);
}
if ($is_selected) {
$classes[] = 'current';
}
$lattrs['class'] = implode(' ', $classes);
(is_null($id)) ? $lattrs : $lattrs['id'] = $id;
$this->elementStart('li', $lattrs);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment