Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/core#1347 - Fix php warning in advanced search when opening some accordions #15650

Merged
merged 1 commit into from
Oct 30, 2019
Merged

dev/core#1347 - Fix php warning in advanced search when opening some accordions #15650

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CRM/Contact/Form/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,8 @@ public static function getModeValue($mode = CRM_Contact_BAO_Query::MODE_CONTACTS
}

self::setModeValues();
if (!array_key_exists($mode, self::$_modeValues)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or we could cast to an array

if (!array_key_exists($mode, (array) self::$_modeValues)) {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would that help because the warning is the first param, because of the array_search above $mode sometimes ends up being FALSE.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah

// Note $mode might === FALSE because array_search above failed, e.g. for searchPane='location'
if (empty(self::$_modeValues[$mode])) {
$mode = CRM_Contact_BAO_Query::MODE_CONTACTS;
}

Expand Down