Merge branch 'master' of github.com:roundcube/roundcubemail

pull/160/head
Aleksander Machniak 11 years ago
commit 7e0d2d9d13

@ -5048,6 +5048,7 @@ function rcube_webmail()
{
var key = 'G'+prop.source+prop.id;
if (this.treelist.remove(key)) {
this.triggerEvent('group_delete', { source:prop.source, id:prop.id });
delete this.env.contactfolders[key];
delete this.env.contactgroups[key];
}

@ -677,8 +677,8 @@ class html_table extends html
*/
public function __construct($attrib = array())
{
$default_attrib = self::$doctype == 'xhtml' ? array('summary' => '', 'border' => 0) : array();
$this->attrib = array_merge($attrib, $default_attrib);
$default_attrib = self::$doctype == 'xhtml' ? array('summary' => '', 'border' => '0') : array();
$this->attrib = array_merge($attrib, $default_attrib);
if (!empty($attrib['tagname']) && $attrib['tagname'] != 'table') {
$this->tagname = $attrib['tagname'];

@ -1444,7 +1444,7 @@ class rcube_imap extends rcube_storage
public function search_once($folder = null, $str = 'ALL')
{
if (!$str) {
return 'ALL';
$str = 'ALL';
}
if (!strlen($folder)) {

Loading…
Cancel
Save