Merge pull request #9477 from eileenmcnaughton/4.7.14-rc

Revert "CRM-19626 - Event Registration page allows registration even …
civicrm · Dec 1, 2016 · 6f65f8a · 6f65f8a
2 parents 805b698 + db7f102
commit 6f65f8a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 81 deletions.
diff --git a/CRM/Event/Form/Registration.php b/CRM/Event/Form/Registration.php
@@ -1322,7 +1322,7 @@ public static function validatePriceSet(&$form, $params) {
       $feeBlock = $priceSetDetails['fields'];
     }
 
-    $optionMaxValues = $fieldSelected = $priceFieldCheck = array();
+    $optionMaxValues = $fieldSelected = array();
     foreach ($params as $pNum => $values) {
       if (!is_array($values) || $values == 'skip') {
         continue;
@@ -1345,11 +1345,6 @@ public static function validatePriceSet(&$form, $params) {
           continue;
         }
 
-        // Make an array for selected price fields.
-        if (!empty($priceFieldId) && !empty($value)) {
-          $priceFieldCheck[] = $priceFieldId;
-        }
-
         $fieldSelected[$pNum] = TRUE;
 
         if (!$hasOptMaxValue || !is_array($value)) {
@@ -1379,7 +1374,7 @@ public static function validatePriceSet(&$form, $params) {
       }
 
       //validate for price field selection.
-      if (empty($fieldSelected[$pNum]) || empty($priceFieldCheck)) {
+      if (empty($fieldSelected[$pNum])) {
         $errors[$pNum]['_qf_default'] = ts('Select at least one option from Event Fee(s).');
       }
     }

diff --git a/tests/phpunit/CRM/Event/Form/RegistrationTest.php b/tests/phpunit/CRM/Event/Form/RegistrationTest.php