From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 12 Mar 2015 15:31:43 +0000 (-0400)
Subject: Merge branch '4.5' into 4.6
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e7ed2ed6dfa73a6225b7d2a2d09529edec03f974;p=civicrm-core.git

Merge branch '4.5' into 4.6
---

e7ed2ed6dfa73a6225b7d2a2d09529edec03f974
diff --cc CRM/Event/Form/EventFees.php
index 48b1cbff94,e102ec4831..cb7d423b38
--- a/CRM/Event/Form/EventFees.php
+++ b/CRM/Event/Form/EventFees.php
@@@ -401,10 -391,9 +401,10 @@@ SELECT  id, html_typ
          $element = $form->add('select', 'discount_id',
            ts('Discount Set'),
            array(
 -            0 => ts('- select -')) + $discounts,
 +            0 => ts('- select -'),
 +          ) + $discounts,
            FALSE,
-           array('onchange' => "buildFeeBlock( {$form->_eventId}, this.value );")
+           array('class' => "crm-select2")
          );
  
          if ($form->_online) {