diff options
| author | thomascube <thomas@roundcube.net> | 2011-01-18 18:00:57 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2011-01-18 18:00:57 +0000 |
| commit | 0501b637a3177cce441166b5fcfe27c9bd9fbe0f (patch) | |
| tree | 5460128ef65d2510a7538c4a0e7336987e090ca1 /program/include/html.php | |
| parent | e81a30752b244394b03cbcaa0df254c93b379782 (diff) | |
Merge branch devel-addressbook (r4193:4382) back into trunk
Diffstat (limited to 'program/include/html.php')
| -rw-r--r-- | program/include/html.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/program/include/html.php b/program/include/html.php index a7599cd9f..ef7314e6f 100644 --- a/program/include/html.php +++ b/program/include/html.php @@ -71,6 +71,9 @@ class html */ public static function tag($tagname, $attrib = array(), $content = null, $allowed_attrib = null) { + if (is_string($attrib)) + $attrib = array('class' => $attrib); + $inline_tags = array('a','span','img'); $suffix = $attrib['nl'] || ($content && $attrib['nl'] !== false && !in_array($tagname, $inline_tags)) ? "\n" : ''; @@ -147,7 +150,7 @@ class html $attr = array('href' => $attr); } return self::tag('a', $attr, $cont, array_merge(self::$common_attrib, - array('href','target','name','onclick','onmouseover','onmouseout','onmousedown','onmouseup'))); + array('href','target','name','rel','onclick','onmouseover','onmouseout','onmousedown','onmouseup'))); } /** @@ -501,7 +504,7 @@ class html_select extends html protected $tagname = 'select'; protected $options = array(); protected $allowed = array('name','size','tabindex','autocomplete', - 'multiple','onchange','disabled'); + 'multiple','onchange','disabled','rel'); /** * Add a new option to this drop-down |