Modification for 4.6alpha4 upgrade

diff --git a/CRM/PCP/Form/Event.php b/CRM/PCP/Form/Event.php
index 0cdbf1dab13d4b152550af0266b8f8395b8791d7..31fb052e6b77bb0b19b3e406cdfebd4af10a0f9b 100644 (file)
--- a/CRM/PCP/Form/Event.php
+++ b/CRM/PCP/Form/Event.php
@@ -69,9 +69,6 @@ class CRM_PCP_Form_Event extends CRM_Event_Form_ManageEvent {
       CRM_Core_DAO::commonRetrieve('CRM_PCP_DAO_PCPBlock', $params, $defaults);
       $defaults['pcp_active'] = CRM_Utils_Array::value('is_active', $defaults);
       // Assign contribution page ID to pageId for referencing in PCP.hlp - since $id is overwritten there. dgg
-      if (!CRM_Utils_Array::value('owner_notify_id', $defaults)) {
-        $defaults['owner_notify_id'] = CRM_Core_OptionGroup::getDefaultValue('pcp_owner_notify');
-      }
       $this->assign('pageId', $this->_id);
     }
 

diff --git a/CRM/Upgrade/4.6.alpha4.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.6.alpha4.msg_template/civicrm_msg_template.tpl
index e975470df0b34f7c3bf6aa9fd7b29fd638c44e23..63ad6dd61d9d9469e4148a2f616e39424c547b46 100644 (file)
--- a/CRM/Upgrade/4.6.alpha4.msg_template/civicrm_msg_template.tpl
+++ b/CRM/Upgrade/4.6.alpha4.msg_template/civicrm_msg_template.tpl
@@ -41,9 +41,9 @@ INSERT INTO civicrm_msg_template
   (msg_title,      msg_subject,                  msg_text,                  msg_html,                  workflow_id,        is_default, is_reserved) VALUES
 {foreach from=$ovNames key=gName item=ovs name=for_groups}
 {foreach from=$ovs key=vName item=title name=for_values}
-      {fetch assign=subject file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.6.alpha3.msg_template/message_templates/`$vName`_subject.tpl"}
-      {fetch assign=text    file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.6.alpha3.msg_template/message_templates/`$vName`_text.tpl"}
-      {fetch assign=html    file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.6.alpha3.msg_template/message_templates/`$vName`_html.tpl"}
+      {fetch assign=subject file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.6.alpha4.msg_template/message_templates/`$vName`_subject.tpl"}
+      {fetch assign=text    file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.6.alpha4.msg_template/message_templates/`$vName`_text.tpl"}
+      {fetch assign=html    file="`$smarty.const.SMARTY_DIR`/../../CRM/Upgrade/4.6.alpha4.msg_template/message_templates/`$vName`_html.tpl"}
       ('{$title}', '{$subject|escape:"quotes"}', '{$text|escape:"quotes"}', '{$html|escape:"quotes"}', @tpl_ovid_{$vName}, 1,          0),
       ('{$title}', '{$subject|escape:"quotes"}', '{$text|escape:"quotes"}', '{$html|escape:"quotes"}', @tpl_ovid_{$vName}, 0,          1) {if $smarty.foreach.for_groups.last and $smarty.foreach.for_values.last};{else},{/if}
 {/foreach}