Mercurial > hg > rc2
comparison program/lib/Roundcube/rcube_contacts.php @ 11:aff04b06b685
various small fixes from upgrades to PHP and/or hangover from fix to apt-get overwrite at beginning of the year somehow
| author | Charlie Root |
|---|---|
| date | Sun, 26 Jan 2025 13:09:03 -0500 |
| parents | 4681f974d28b |
| children | bea5a38be938 |
comparison
equal
deleted
inserted
replaced
| 10:8e3cc6fc791d | 11:aff04b06b685 |
|---|---|
| 354 // Post-searching in vCard data fields | 354 // Post-searching in vCard data fields |
| 355 // we will search in all records and then build a where clause for their IDs | 355 // we will search in all records and then build a where clause for their IDs |
| 356 if (!empty($post_search) || !empty($required)) { | 356 if (!empty($post_search) || !empty($required)) { |
| 357 $ids = array(0); | 357 $ids = array(0); |
| 358 // build key name regexp | 358 // build key name regexp |
| 359 $regexp = '/^(' . implode(array_keys($post_search), '|') . ')(?:.*)$/'; | 359 $regexp = '/^(' . implode('|', array_keys($post_search)) . ')(?:.*)$/'; |
| 360 // use initial WHERE clause, to limit records number if possible | 360 // use initial WHERE clause, to limit records number if possible |
| 361 if (!empty($where)) | 361 if (!empty($where)) |
| 362 $this->set_search_set($where); | 362 $this->set_search_set($where); |
| 363 | 363 |
| 364 // count result pages | 364 // count result pages |
