MC-18057: Product doesn'y match by "Date" attribute condition

svitja · svitja · commit 644ffcd1c5e8 · 2019-11-21T10:08:14.000+02:00
diff --git a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
@@ -885,10 +885,8 @@ public function validateAttribute($validatedValue)
      */
     protected function _compareValues($validatedValue, $value, $strict = true)
     {
-        if (null === $value || null === $validatedValue) {
-            return $value == $validatedValue;
-        }
-        if ($strict && is_numeric($validatedValue) && is_numeric($value)) {
+        if (null === $value || null === $validatedValue ||
+            $strict && is_numeric($validatedValue) && is_numeric($value)) {
             return $validatedValue == $value;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -885,10 +885,8 @@ public function validateAttribute($validatedValue)`
`885`	`885`	`*/`
`886`	`886`	`protected function _compareValues($validatedValue, $value, $strict = true)`
`887`	`887`	`{`
`888`		`- if (null === $value \|\| null === $validatedValue) {`
`889`		`- return $value == $validatedValue;`
`890`		`- }`
`891`		`- if ($strict && is_numeric($validatedValue) && is_numeric($value)) {`
	`888`	`+ if (null === $value \|\| null === $validatedValue \|\|`
	`889`	`+ $strict && is_numeric($validatedValue) && is_numeric($value)) {`
`892`	`890`	`return $validatedValue == $value;`
`893`	`891`	`}`
`894`	`892`