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

thomascube

2011-01-18 0501b637a3177cce441166b5fcfe27c9bd9fbe0f

 program/include/rcube_template.php

@@ -996,8 +996,11 @@
        $attrib['action'] = './';

        // we already have a <form> tag
        if ($attrib['form'])
        if ($attrib['form']) {
            if ($this->framed || !empty($_REQUEST['_framed']))
                $hidden->add(array('name' => '_framed', 'value' => '1'));
            return $hidden->show() . $content;
        }
        else
            return $this->form_tag($attrib, $hidden->show() . $content);
    }