Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-23-17-12-38

diff --cc CRM/Campaign/BAO/Survey.php
Simple merge

diff --cc CRM/Campaign/Form/Petition.php
index 6ac3fbac66c9cfc44971c5d9933229ec604150c9,709cd644508dd4af682ee7b2a47d4c899b2ea157..5cc1b85b2e0f80636b0f66bf4628f70ffcc0f8eb
--- 1/CRM/Campaign/Form/Petition.php
--- 2/CRM/Campaign/Form/Petition.php
+++ b/CRM/Campaign/Form/Petition.php
@@@ -137,10 -137,19 +137,19 @@@ class CRM_Campaign_Form_Petition extend
        'weight' => 2,
      );
  
-     if ($ufGroupId = CRM_Core_BAO_UFJoin::findUFGroupId($ufJoinParams)) {
-       $defaults['contact_profile_id'] = $ufGroupId;
+     if ($ufContactGroupId = CRM_Core_BAO_UFJoin::findUFGroupId($ufContactJoinParams)) {
+       $defaults['contact_profile_id'] = $ufContactGroupId;
+     }
+     $ufActivityJoinParams = array(
+       'entity_table' => 'civicrm_survey',
+       'entity_id' => $this->_surveyId,
+       'weight' => 1,
+     );
+ 
+     if ($ufActivityGroupId = CRM_Core_BAO_UFJoin::findUFGroupId($ufActivityJoinParams)) {
+       $defaults['profile_id'] = $ufActivityGroupId;
      }
 -    
 +
      if (!isset($defaults['is_active'])) {
        $defaults['is_active'] = 1;
      }

diff --cc CRM/Contribute/BAO/ContributionPage.php
Simple merge

diff --cc CRM/Contribute/Form/Contribution/Confirm.php
Simple merge

diff --cc CRM/Member/Form/Membership.php
Simple merge

diff --cc CRM/Price/BAO/PriceFieldValue.php
Simple merge

diff --cc CRM/Price/BAO/PriceSet.php
Simple merge

diff --cc CRM/Upgrade/Incremental/php/FourThree.php
Simple merge

diff --cc CRM/Utils/Hook.php
Simple merge