Fixed problem applying discount labels to 'automatic discount' memberships;...

Fixed problem applying discount labels to 'automatic discount' memberships; automatic discounts are used for discount triggering only.

cividiscount.php

@@ -494,8 +494,7 @@ function cividiscount_civicrm_membershipTypeValues(&$form, &$membershipTypeValue
 
   $discount = array_shift($discounts);
   foreach ($membershipTypeValues as &$values) {
-    if (CRM_Utils_Array::value($values['id'], $discount['memberships']) ||
-        CRM_Utils_Array::value($values['id'], $discount['autodiscount'])) {
+    if (CRM_Utils_Array::value($values['id'], $discount['memberships'])) {
       list($value, $label) = _cividiscount_calc_discount($values['minimum_fee'], $values['name'], $discount, $autodiscount);
       $values['minimum_fee'] = $value;
       $values['name'] = $label;