diff options
author | Aleksander Machniak <alec@alec.pl> | 2013-11-18 11:08:20 +0100 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2013-11-18 11:08:20 +0100 |
commit | 51fe045a0422e2c6a92cedf3b233dc66b21da64a (patch) | |
tree | 74484712f9ce4b56d094e3970c65f5505733b29f /program/lib/Roundcube/rcube_contacts.php | |
parent | fa635d886276cc33ab3ae67d852ec93954e2613a (diff) |
Fix deprecated function usage
Diffstat (limited to 'program/lib/Roundcube/rcube_contacts.php')
-rw-r--r-- | program/lib/Roundcube/rcube_contacts.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/program/lib/Roundcube/rcube_contacts.php b/program/lib/Roundcube/rcube_contacts.php index 5c9e5ab39..2e03352bf 100644 --- a/program/lib/Roundcube/rcube_contacts.php +++ b/program/lib/Roundcube/rcube_contacts.php @@ -350,7 +350,7 @@ class rcube_contacts extends rcube_addressbook if (in_array($col, $this->table_cols)) { switch ($mode) { case 1: // strict - $where[] = '(' . $this->db->quoteIdentifier($col) . ' = ' . $this->db->quote($val) + $where[] = '(' . $this->db->quote_identifier($col) . ' = ' . $this->db->quote($val) . ' OR ' . $this->db->ilike($col, $val . $AS . '%') . ' OR ' . $this->db->ilike($col, '%' . $AS . $val . $AS . '%') . ' OR ' . $this->db->ilike($col, '%' . $AS . $val) . ')'; @@ -390,7 +390,7 @@ class rcube_contacts extends rcube_addressbook } foreach (array_intersect($required, $this->table_cols) as $col) { - $and_where[] = $this->db->quoteIdentifier($col).' <> '.$this->db->quote(''); + $and_where[] = $this->db->quote_identifier($col).' <> '.$this->db->quote(''); } if (!empty($where)) { @@ -630,7 +630,7 @@ class rcube_contacts extends rcube_addressbook $a_insert_cols = $a_insert_values = array(); foreach ($save_data as $col => $value) { - $a_insert_cols[] = $this->db->quoteIdentifier($col); + $a_insert_cols[] = $this->db->quote_identifier($col); $a_insert_values[] = $this->db->quote($value); } @@ -665,7 +665,7 @@ class rcube_contacts extends rcube_addressbook $save_cols = $this->convert_save_data($save_cols, $record); foreach ($save_cols as $col => $value) { - $write_sql[] = sprintf("%s=%s", $this->db->quoteIdentifier($col), $this->db->quote($value)); + $write_sql[] = sprintf("%s=%s", $this->db->quote_identifier($col), $this->db->quote($value)); } if (!empty($write_sql)) { |