Skip to content

t509: fix: template_selection field validation maps to template_id rule key #800

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

Merged
superdav42 merged 2 commits into from
Apr 12, 2026
+31 −4
Merged

t509: fix: template_selection field validation maps to template_id rule key #800

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c91e775
t509: fix: template_selection field validation maps to template_id ru…
superdav42 Apr 12, 2026
a246286
Merge branch 'main' into bugfix/template-validation
superdav42 Apr 12, 2026
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
35 changes: 31 additions & 4 deletions inc/checkout/class-checkout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2421,6 +2421,17 @@ public function get_validation_rules() {
'products',
];

/*
* Maps checkout field IDs to their corresponding validation-rule
* keys when the two differ. For example the "template_selection"
* signup field submits its value as "template_id" in the POST data,
* so a `required` attribute on that field must target the
* "template_id" rule — not "template_selection".
*/
$field_to_rule_key = [
'template_selection' => 'template_id',
];

/**
* Add the additional required fields.
*/
Expand All @@ -2429,10 +2440,26 @@ public function get_validation_rules() {
* General required fields
*/
if (wu_get_isset($field, 'required') && wu_get_isset($field, 'id')) {
if (isset($validation_rules[ $field['id'] ])) {
$validation_rules[ $field['id'] ] .= '|required';
$rule_key = $field_to_rule_key[ $field['id'] ] ?? $field['id'];

if (isset($validation_rules[ $rule_key ])) {
$validation_rules[ $rule_key ] .= '|required';
} else {
$validation_rules[ $field['id'] ] = 'required';
$validation_rules[ $rule_key ] = 'required';
}

/*
* For template_id the `required` rule alone is not enough
* because Rakit considers integer 0 as "present". Add min:1
* so the checkout rejects template_id=0 when the form
* includes a required template selection field.
*
* Admin/network site creation does not go through checkout
* validation, so blank (no-template) sites can still be
* created from the network admin.
*/
if ('template_id' === $rule_key) {
$validation_rules[ $rule_key ] .= '|min:1';
}
}

Expand Down Expand Up @@ -2508,7 +2535,7 @@ public function validate($rules = null) {
[
'password_conf' => __('Password confirmation', 'ultimate-multisite'),
'email_address_confirmation' => __('Email confirmation', 'ultimate-multisite'),
'template_id' => __('Template ID', 'ultimate-multisite'),
'template_id' => __('Template Selection', 'ultimate-multisite'),
'valid_password' => __('Valid password', 'ultimate-multisite'),
'products' => __('Products', 'ultimate-multisite'),
'gateway' => __('Payment Gateway', 'ultimate-multisite'),
Expand Down
Loading