summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-08-18 10:00:45 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-08-18 10:00:45 +0200
commit6a0a4a3a5230e823b812b98272c5e011d07aac35 (patch)
tree05c3ecd2e2b7bf307c130fdbeedb4b92af2e60c2 /program
parent1299c6a231dded7d941a3e32f3b531476cd5d07d (diff)
Remove empty brackets, slashes and spaces from contact search name
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/rcube_addressbook.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php
index 71d556234..5bc3edf2d 100644
--- a/program/lib/Roundcube/rcube_addressbook.php
+++ b/program/lib/Roundcube/rcube_addressbook.php
@@ -605,7 +605,8 @@ abstract class rcube_addressbook
}
$result = preg_replace('/\s+/', ' ', $result);
- $result = trim($result);
+ $result = preg_replace('/\s*(<>|\(\)|\[\])/', '', $result);
+ $result = trim($result, '/ ');
return $result;
}