Fix #37488 don't emit from_template_ option when template id is empty#38702
Merged
eldy merged 1 commit intoJun 11, 2026
Merged
Conversation
…is empty When $arraydefaultmessage->email_from is set but $arraydefaultmessage->id is empty, FormMail built a 'from_template_' option key with no trailing id, and the same string was passed as the preselected value of the fromtype select. The downstream parser in core/actions_sendmails.inc.php matches /from_template_(\d+)/ which requires at least one digit, so the match failed and the from address fell back through the else branch. Guard the option emission and the selected-value computation against empty $arraydefaultmessage->id so the malformed key is never produced. Signed-off-by: Dolicraft <contact@dolicraft.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
When
$arraydefaultmessage->email_fromis set but$arraydefaultmessage->idis empty,FormMail::showForm()built afrom_template_option key with no trailing id, and the same string was passed as the preselected value of thefromtypeselect. The downstream parser athtdocs/core/actions_sendmails.inc.php:337matches/from_template_(\d+)/(requires at least one digit) so the match failed, the SQLWHERE rowid = 0returned nothing, and the from address fell through to the generic else branch - matching what the reporter saw.Guard the option emission and the selected-value computation against an empty
$arraydefaultmessage->idso the malformed key is never produced. Keeps the existing parser regex tight rather than widening it to\d*which would have masked future bugs.