From: kurund <kurund@civicrm.org>
Date: Wed, 2 Oct 2013 10:20:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-10-02-11-18-44
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ce4fd42f89389d27c1ddd061b5ad2e92809ebe9a;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-10-02-11-18-44

Conflicts:
	sql/civicrm_generated.mysql
	templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
	xml/version.xml
---

ce4fd42f89389d27c1ddd061b5ad2e92809ebe9a
diff --cc CRM/Event/BAO/Event.php
index 9645c93d77,43971d9a25..bf38cb365c
--- a/CRM/Event/BAO/Event.php
+++ b/CRM/Event/BAO/Event.php
@@@ -112,9 -112,9 +112,9 @@@ class CRM_Event_BAO_Event extends CRM_E
      else {
        CRM_Utils_Hook::post('create', 'Event', $event->id, $event);
      }
-     if ($financialTypeId && CRM_Utils_Array::value('financial_type_id', $params) 
+     if ($financialTypeId && CRM_Utils_Array::value('financial_type_id', $params)
        && $financialTypeId != $params['financial_type_id']) {
 -      CRM_Price_BAO_FieldValue::updateFinancialType($params['id'], 'civicrm_event', $params['financial_type_id']);
 +      CRM_Price_BAO_PriceFieldValue::updateFinancialType($params['id'], 'civicrm_event', $params['financial_type_id']);
      }
      return $result;
    }