UFMatch - E_NOTICE when nonexistent uf_id #21576
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
|
(Standard links)
|
colemanw
reviewed
Sep 22, 2021
CRM/Core/BAO/UFMatch.php
Outdated
| @@ -624,21 +624,20 @@ public static function getUFValues($ufID = NULL) { | |||
| return []; | |||
| } | |||
|
|
|||
| static $ufValues; | |||
| if ($ufID && !isset($ufValues[$ufID])) { | |||
| if ($ufID && !isset(Civi::$statics[__CLASS__][__FUNCTION__][$ufID])) { | |||
There was a problem hiding this comment.
This is fine, but FYI the if ($ufID part is redundant with the if (!$ufID) above.
There was a problem hiding this comment.
Right. I'll update.
6754a27 to
e6bf2d4
Compare
|
another one bites the dust |
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.
Overview
Calling CRM_Core_BAO_UFMatch::getUFValues with a nonexistent uf_id gives an E_NOTICE.
Before
E_NOTICE
After
No notice.
Also use civi::statics.
Technical Details
The main thing is it calls
return $ufValues[$ufID];without checking if it actually did set it.Comments