Merge branch devel-addressbook (r4193:4382) back into trunk

thomascube

2011-01-18 0501b637a3177cce441166b5fcfe27c9bd9fbe0f

 program/include/html.php

@@ -71,6 +71,9 @@
     */
    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 @@
            $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 @@
    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