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.

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

#29026 [Form] fix: selectForForms issue for manage case where objectdesc don't need to reset #30715

Open
wants to merge 1 commit into
base: 19.0
Choose a base branch
from
Open
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion htdocs/core/class/html.form.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -8067,11 +8067,16 @@ public function selectForForms($objectdesc, $htmlname, $preSelectedValue, $showe
}
} else {
// For a property in ->fields
if (array_key_exists($tmparray[1], $objectforfieldstmp->fields)) {
if (array_key_exists($tmparray[1], $objectforfieldstmp->fields) && preg_match('/^integer[^:]*:/', $objectforfieldstmp->fields[$tmparray[1]]['type'])) {
$objectdesc = $objectforfieldstmp->fields[$tmparray[1]]['type'];
$objectdesc = preg_replace('/^integer[^:]*:/', '', $objectdesc);
}
}

// Reset $objectdesc to default value
if (empty($objectdesc)) {
$objectdesc = $objectdescorig;
}
}
}

Expand Down
Loading