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

Jump to bottom

EZP-31340: Corrected outdated choiceloaders (introduced Symfony bugfix) #1379

Closed
wants to merge 2 commits into from
Closed

EZP-31340: Corrected outdated choiceloaders (introduced Symfony bugfix) #1379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
605202e
EZP-31340 - Corrected outdated choiceloaders (introduced Symfonu bugfix)
May 17, 2020
641fee9
Revert statement for loadValuesForChoices()
May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/lib/Form/Type/ChoiceList/Loader/BaseChoiceLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ public function loadValuesForChoices(array $choices, $value = null)
return [];
}

// If no callable is set, choices are the same as values
if (null === $value) {
return $choices;
}

return $this->loadChoiceList($value)->getValuesForChoices($choices);
}
}
5 changes: 0 additions & 5 deletions src/lib/Form/Type/ChoiceList/Loader/ContentCreateContentTypeChoiceLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@ public function loadChoicesForValues(array $values, $value = null)
return [];
}

// If no callable is set, values are the same as choices
if (null === $value) {
return $values;
}

return $this->loadChoiceList($value)->getChoicesForValues($values);
}

Expand Down
5 changes: 0 additions & 5 deletions src/lib/Form/Type/ChoiceList/Loader/ContentCreateLanguageChoiceLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@ public function loadChoicesForValues(array $values, $value = null)
return [];
}

// If no callable is set, values are the same as choices
if (null === $value) {
return $values;
}

return $this->loadChoiceList($value)->getChoicesForValues($values);
}

Expand Down
5 changes: 0 additions & 5 deletions src/lib/Form/Type/ChoiceList/Loader/ContentTypeChoiceLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ public function loadChoicesForValues(array $values, $value = null)
return [];
}

// If no callable is set, values are the same as choices
if (null === $value) {
return $values;
}

return $this->loadChoiceList($value)->getChoicesForValues($values);
}

Expand Down