Request 1867 (accepted)

Overview

Request 1867 (accepted)

update to 1.1.7 upstream release

Created by tpokorra over 7 years ago
In state accepted

Submit roundcubemail

Submit package home:tpokorr...:3.4:Updates / roundcubemail to package Kolab:3.4:Updates / roundcubemail

roundcubemail.spec Changed

debian.changelog Changed

roundcubemail-1.1.6.tar.gz/CHANGELOG -> roundcubemail-1.1.7.tar.gz/CHANGELOG Changed

roundcubemail-1.1.6.tar.gz/index.php -> roundcubemail-1.1.7.tar.gz/index.php Changed

roundcubemail-1.1.6.tar.gz/installer/index.php -> roundcubemail-1.1.7.tar.gz/installer/index.php Changed

roundcubemail-1.1.6.tar.gz/program/include/iniset.php -> roundcubemail-1.1.7.tar.gz/program/include/iniset.php Changed

roundcubemail-1.1.6.tar.gz/program/lib/Roundcube/bootstrap.php -> roundcubemail-1.1.7.tar.gz/program/lib/Roundcube/bootstrap.php Changed

roundcubemail-1.1.6.tar.gz/program/lib/Roundcube/rcube.php -> roundcubemail-1.1.7.tar.gz/program/lib/Roundcube/rcube.php Changed

roundcubemail-1.1.6.tar.gz/program/steps/mail/autocomplete.inc -> roundcubemail-1.1.7.tar.gz/program/steps/mail/autocomplete.inc Changed

@@ -65,8 +65,8 @@
     $search_lc = mb_strtolower($search);
     $mode     |= rcube_addressbook::SEARCH_GROUPS;
 
-    foreach ($book_types as $id) {
-        $abook = $RCMAIL->get_address_book($id);
+    foreach ($book_types as $abook_id) {
+        $abook = $RCMAIL->get_address_book($abook_id);
         $abook->set_pagesize($MAXNUM);
 
         if ($result = $abook->search($RCMAIL->config->get('contactlist_fields'), $search, $mode, true, true, 'email')) {
@@ -93,7 +93,12 @@
 
                     // skip duplicates
                     if (empty($contacts[$index])) {
-                        $contact = array('name' => $contact, 'type' => $sql_arr['_type']);
+                        $contact = array(
+                            'name'   => $contact,
+                            'type'   => $sql_arr['_type'],
+                            'id'     => $sql_arr['ID'],
+                            'source' => $abook_id,
+                        );
 
                         if (($display = rcube_addressbook::compose_search_name($sql_arr, $email, $name)) && $display != $contact['name']) {
                             $contact['display'] = $display;
@@ -136,7 +141,7 @@
                                 'email'  => $email,
                                 'type'   => 'group',
                                 'id'     => $group['ID'],
-                                'source' => $id,
+                                'source' => $abook_id,
                             );
 
                             if (count($contacts) >= $MAXNUM) {
@@ -153,7 +158,7 @@
                             'name'   => $group['name'] . ' (' . intval($result->count) . ')',
                             'type'   => 'group',
                             'id'     => $group['ID'],
-                            'source' => $id
+                            'source' => $abook_id,
                         );
 
                         if (count($contacts) >= $MAXNUM) {

roundcubemail-1.1.6.tar.gz/program/steps/mail/search.inc -> roundcubemail-1.1.7.tar.gz/program/steps/mail/search.inc Changed

roundcubemail-1.1.6.tar.gz/program/steps/mail/sendmail.inc -> roundcubemail-1.1.7.tar.gz/program/steps/mail/sendmail.inc Changed

roundcubemail.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 1867 0

Request History

tpokorra created request over 7 years ago

update to 1.1.7 upstream release

timotheus accepted request over 7 years ago