Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-09-11-44-07

Conflicts:
	CRM/Contribute/BAO/ContributionPage.php

diff --cc CRM/Activity/BAO/Activity.php
Simple merge

diff --cc CRM/Contribute/BAO/ContributionPage.php
index df2fffa39f8802132e6be75481646e8a692a92d6,29b226c7ea1271f086a10f7b7aca928a572edea6..56889aeb95d8b3f74a2c9b4874430059f6792b04
--- 1/CRM/Contribute/BAO/ContributionPage.php
--- 2/CRM/Contribute/BAO/ContributionPage.php
+++ b/CRM/Contribute/BAO/ContributionPage.php
@@@ -663,25 -647,26 +663,26 @@@ class CRM_Contribute_BAO_ContributionPa
      CRM_Price_BAO_PriceSet::copyPriceSet('civicrm_contribution_page', $id, $copy->id);
  
      $copyTellFriend = &CRM_Core_DAO::copyGeneric('CRM_Friend_DAO_Friend', array(
 -        'entity_id' => $id,
 -        'entity_table' => 'civicrm_contribution_page',
 -      ), array(
 -        'entity_id' => $copy->id,
 -      ));
 +      'entity_id' => $id,
 +      'entity_table' => 'civicrm_contribution_page',
 +    ), array(
 +      'entity_id' => $copy->id,
 +    ));
  
      $copyPersonalCampaignPages = &CRM_Core_DAO::copyGeneric('CRM_PCP_DAO_PCPBlock', array(
 -        'entity_id' => $id,
 -        'entity_table' => 'civicrm_contribution_page',
 -      ), array(
 -        'entity_id' => $copy->id,
 -        'target_entity_id' => $copy->id,
 -      ));
 +      'entity_id' => $id,
 +      'entity_table' => 'civicrm_contribution_page',
 +    ), array(
 +      'entity_id' => $copy->id,
++      'target_entity_id' => $copy->id,
 +    ));
  
      $copyPremium = &CRM_Core_DAO::copyGeneric('CRM_Contribute_DAO_Premium', array(
 -        'entity_id' => $id,
 -        'entity_table' => 'civicrm_contribution_page',
 -      ), array(
 -        'entity_id' => $copy->id,
 -      ));
 +      'entity_id' => $id,
 +      'entity_table' => 'civicrm_contribution_page',
 +    ), array(
 +      'entity_id' => $copy->id,
 +    ));
      $premiumQuery = "
  SELECT id
  FROM civicrm_premiums