CRM-19048 - Additional fix #9374
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jitendrapurohit
force-pushed
the
CRM-19048
branch
2 times, most recently
from
b196895 to
408fe09
Compare
jitendrapurohit
changed the title
|
test this please |
|
Nice updates to the unit tests. :) |
totten
reviewed
Nov 16, 2016
| $csid = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionValue', 'CRM_Contact_Form_Search_Custom_FullText', 'value', 'name'); | ||
| $url = CRM_Utils_System::url("civicrm/contact/search/custom", "csid={$csid}&reset=1"); | ||
| $operators = implode("', '", $operators); | ||
| CRM_Core_Error::statusBounce("Full-Text Search does not support the use of a search string ending with any of these operators ('{$operators}' or a single '@'). Please adjust your search term and try again.", $url); |
There was a problem hiding this comment.
In the string with any of these operators ('{$operators}' or a single '@')., how would that display? e.g.
with any of these operators('Array' or a single '@').with any of these operators('+-~()' or a single '@').with any of these operators('+ - ~ ( )' or a single '@').with any of these operators('+, -, ~, (, )' or a single '@').
Feel like it would be the first one (problematic) -- but any of the others would be fine.
There was a problem hiding this comment.
@totten Here, implode will join the array values with ', ' and '{$operators}' are enclosed within single quotes. So message would be displayed as with any of these operators ('+', '-', '~', '(', ')' or a single '@').
|
@totten If the changes seems fine, is this ok to be merged ? |
|
merging as per Brian's comments on the issue |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This works for following text searches.
@domain.comworks and returns result containing@domain.comand not@domain.org.some@works fine.@,+-,some+, etc as mentioned in the doc file.