diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-01-04 11:19:42 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-01-04 11:19:42 +0100 |
| commit | 7e0d2d9d13ff862597b689bc8cd3195dc065bf9b (patch) | |
| tree | 92c468c74c19d755848a6d5c5201e1876a435e25 | |
| parent | 4e040e304f330c454a062a6cc30e0852daf381aa (diff) | |
| parent | 4957530dec4fea360bac9e5da8f8d5b2ad51cd9b (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
| -rw-r--r-- | program/js/app.js | 1 | ||||
| -rw-r--r-- | program/lib/Roundcube/html.php | 4 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_imap.php | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/program/js/app.js b/program/js/app.js index 44afd5c7c..da102143f 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -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]; } diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php index f6f744cb2..587b030ce 100644 --- a/program/lib/Roundcube/html.php +++ b/program/lib/Roundcube/html.php @@ -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']; diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php index 4c3bf6fcd..432227091 100644 --- a/program/lib/Roundcube/rcube_imap.php +++ b/program/lib/Roundcube/rcube_imap.php @@ -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)) { |