Check for known options in serialized values of a widget

martinschumann · Sep 29, 2020 · a392eea · a392eea
1 parent aea1435
commit a392eea
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Resources/contao/library/Contao/Widget.php b/src/Resources/contao/library/Contao/Widget.php
@@ -1327,14 +1327,15 @@ public static function getAttributesFromDca($arrData, $strName, $varValue=null,
 			}
 
 			$isKnownOption = false;
-
+			$varValue = StringUtil::deserialize($varValue, true);
+
 			foreach ($arrData['options'] as $k=>$v)
 			{
 				if (!\is_array($v))
 				{
 					$value = $blnIsAssociative ? $k : $v;
 
-					if ($varValue && $varValue == $value)
+					if (\in_array($value, $varValue))
 					{
 						$isKnownOption = true;
 					}
@@ -1350,7 +1351,7 @@ public static function getAttributesFromDca($arrData, $strName, $varValue=null,
 				{
 					$value = $blnIsAssoc ? $kk : $vv;
 
-					if ($varValue && $varValue == $value)
+					if (\in_array($value, $varValue))
 					{
 						$isKnownOption = true;
 					}