From c1f0eff9645fd9a5aeab3a00182d81f644971041 Mon Sep 17 00:00:00 2001 From: NileemaJadhav Date: Wed, 21 Jan 2015 13:35:54 +0530 Subject: [PATCH] Modification for 4.6alpha4 upgrade --- CRM/PCP/Form/Event.php | 3 --- .../4.6.alpha4.msg_template/civicrm_msg_template.tpl | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CRM/PCP/Form/Event.php b/CRM/PCP/Form/Event.php index 0cdbf1dab1..31fb052e6b 100644 --- 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 e975470df0..63ad6dd61d 100644 --- 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} -- 2.25.1