From fbc1254b95d7e2f3f2cc557346069d8d743408c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Myszka?= Date: Tue, 28 Jan 2020 15:34:28 +0100 Subject: [PATCH] EZP-31297 - Narrowed user preferences values to the available list (Symfony bugfix adaptation for BaseChoiceLoader) --- .../Form/Type/ChoiceList/Loader/BaseChoiceLoader.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/lib/Form/Type/ChoiceList/Loader/BaseChoiceLoader.php b/src/lib/Form/Type/ChoiceList/Loader/BaseChoiceLoader.php index a9d22f65ec..3d0108498a 100644 --- a/src/lib/Form/Type/ChoiceList/Loader/BaseChoiceLoader.php +++ b/src/lib/Form/Type/ChoiceList/Loader/BaseChoiceLoader.php @@ -41,11 +41,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); } @@ -60,11 +55,6 @@ 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); } }