Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
4dfdb272
Commit
4dfdb272
authored
Feb 22, 2016
by
Thomas Müller
Browse files
Case insensitive search in contacts - fixes #22575
parent
4537eaac
Changes
2
Hide whitespace changes
Inline
Side-by-side
apps/dav/lib/carddav/carddavbackend.php
View file @
4dfdb272
...
...
@@ -776,7 +776,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
$query2
->
orWhere
(
$query2
->
expr
()
->
andX
(
$query2
->
expr
()
->
eq
(
'cp.name'
,
$query
->
createNamedParameter
(
$property
)),
$query2
->
expr
()
->
like
(
'cp.value'
,
$query
->
createNamedParameter
(
'%'
.
$this
->
db
->
escapeLikeParameter
(
$pattern
)
.
'%'
))
$query2
->
expr
()
->
i
like
(
'cp.value'
,
$query
->
createNamedParameter
(
'%'
.
$this
->
db
->
escapeLikeParameter
(
$pattern
)
.
'%'
))
)
);
}
...
...
apps/dav/tests/unit/carddav/carddavbackendtest.php
View file @
4dfdb272
...
...
@@ -547,8 +547,8 @@ class CardDavBackendTest extends TestCase {
[
'John'
,
[
'FN'
],
[
'John Doe'
,
'John M. Doe'
]],
[
'M. Doe'
,
[
'FN'
],
[
'John M. Doe'
]],
[
'Do'
,
[
'FN'
],
[
'John Doe'
,
'John M. Doe'
]],
//
check if duplicates are handled correctly
[
'
J
ohn'
,
[
'FN'
,
'CLOUD'
],
[
'John Doe'
,
'John M. Doe'
]]
,
'
check if duplicates are handled correctly
'
=>
[
'John'
,
[
'FN'
,
'CLOUD'
],
[
'John Doe'
,
'John M. Doe'
]],
'case insensitive'
=>
[
'
j
ohn'
,
[
'FN'
],
[
'John Doe'
,
'John M. Doe'
]]
];
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment