Small improvements and codestyle

git-svn-id: https://svn.roundcube.net/trunk@4932 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 2 insertions, 2 deletions

diff --git a/roundcubemail/program/include/rcube_contacts.php b/roundcubemail/program/include/rcube_contacts.php
index 799d59618..3ad53a6db 100644
--- a/roundcubemail/program/include/rcube_contacts.php
+++ b/roundcubemail/program/include/rcube_contacts.php
@@ -300,7 +300,7 @@ class rcube_contacts extends rcube_addressbook
             }
         }
 
-        foreach ($required as $col) {
+        foreach (array_intersect($required, $this->table_cols) as $col) {
             $and_where[] = $this->db->quoteIdentifier($col).' <> '.$this->db->quote('');
         }
 
diff --git a/roundcubemail/program/steps/mail/autocomplete.inc b/roundcubemail/program/steps/mail/autocomplete.inc
index fbb61a442..395c0e12b 100644
--- a/roundcubemail/program/steps/mail/autocomplete.inc
+++ b/roundcubemail/program/steps/mail/autocomplete.inc
@@ -37,7 +37,7 @@ if ($RCMAIL->action == 'group-expand') {
     $OUTPUT->command('replace_group_recipients', $gid, join(', ', $members));
   }
 }
-else if ($book_types && $search = get_input_value('_search', RCUBE_INPUT_GPC, true)) {
+else if ($book_types && ($search = get_input_value('_search', RCUBE_INPUT_GPC, true))) {
   $contacts = array();
   $books_num = count($book_types);