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

This commit is contained in:
Samantha Doherty 2011-06-09 20:24:09 -04:00
commit d43e977195

View File

@ -1351,13 +1351,16 @@ 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;