V1.1: Release

library/rules_shipping_framework.php

@@ -908,7 +908,11 @@ class ShippingRule {
 			$op = array_shift($expr); // ignore the "FUNCTION"
 			$func = array_shift($expr); // The scoping function name
 			$expression = array_shift($expr); // The expression to be evaluated
-			$conditions = $expr; // the remaining $expr list now contains the conditions
+			// the remaining $expr list now contains the conditions. Evaluate them one by one:
+			$conditions = array();
+			foreach ($expr as $e) {
+				$conditions[] = $this->evaluateTerm($e, $vals, $products, $cartvals_callback);
+			}
 			return $this->evaluateScoping ($expression, $func, $conditions, $vals, $products, $cartvals_callback);
 			
 		} elseif (is_array($expr)) {