projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #6450 from civicrm/4.6
[civicrm-core.git]
/
CRM
/
Contact
/
Form
/
Search
/
Builder.php
diff --git
a/CRM/Contact/Form/Search/Builder.php
b/CRM/Contact/Form/Search/Builder.php
index 033114b650909341b59a4b97fa1e837b090b1add..7a702587bec0ac79a45208a0aee42cefc0f28207 100644
(file)
--- a/
CRM/Contact/Form/Search/Builder.php
+++ b/
CRM/Contact/Form/Search/Builder.php
@@
-255,12
+255,12
@@
class CRM_Contact_Form_Search_Builder extends CRM_Contact_Form_Search {
$inVal = trim($v[2]);
//checking for format to avoid db errors
if ($type == 'Int') {
$inVal = trim($v[2]);
//checking for format to avoid db errors
if ($type == 'Int') {
- if (!preg_match('/^[
(]([A-Za-z0-9\,]+)[)]
$/', $inVal)) {
+ if (!preg_match('/^[
A-Za-z0-9\,]+
$/', $inVal)) {
$errorMsg["value[$v[3]][$v[4]]"] = ts("Please enter correct Data (in valid format).");
}
}
else {
$errorMsg["value[$v[3]][$v[4]]"] = ts("Please enter correct Data (in valid format).");
}
}
else {
- if (!
(substr($inVal, 0, 1) == '(' && substr($inVal, -1, 1) == ')') && !preg_match('/^[(]([A-Za-z0-9åäöÅÄÖüÜœŒæÆøØ\,\s]+)[)]
$/', $inVal)) {
+ if (!
preg_match('/^[A-Za-z0-9åäöÅÄÖüÜœŒæÆøØ()\,\s]+
$/', $inVal)) {
$errorMsg["value[$v[3]][$v[4]]"] = ts("Please enter correct Data (in valid format).");
}
}
$errorMsg["value[$v[3]][$v[4]]"] = ts("Please enter correct Data (in valid format).");
}
}