From 308fe727c87ed7ed0022a45ef9c19929cee74874 Mon Sep 17 00:00:00 2001
From: Stephanie Gray <stephanie@freeform.ca>
Date: Wed, 30 Sep 2015 15:47:39 -0400
Subject: [PATCH] CRM-16415 - convert button to crmButton, convert single url
 variable to path plus query in array to fix issue with encoded &

---
 CRM/Campaign/Page/SurveyType.php           | 2 +-
 templates/CRM/Campaign/Page/Petition.tpl   | 8 ++++++--
 templates/CRM/Campaign/Page/SurveyType.tpl | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CRM/Campaign/Page/SurveyType.php b/CRM/Campaign/Page/SurveyType.php
index a873a40de5..817dc2d6cb 100644
--- a/CRM/Campaign/Page/SurveyType.php
+++ b/CRM/Campaign/Page/SurveyType.php
@@ -81,7 +81,7 @@ class CRM_Campaign_Page_SurveyType extends CRM_Core_Page_Basic {
 
     CRM_Utils_System::setTitle(ts('%1 Options', array(1 => $this->_GName)));
 
-    $this->assign('addSurveyType', CRM_Utils_System::url("civicrm/admin/campaign/surveyType", 'reset=1&action=add'));
+    $this->assign('addSurveyType', array("civicrm/admin/campaign/surveyType", "reset=1&action=add"));
   }
 
   /**
diff --git a/templates/CRM/Campaign/Page/Petition.tpl b/templates/CRM/Campaign/Page/Petition.tpl
index 9845b310f6..e315c81e11 100644
--- a/templates/CRM/Campaign/Page/Petition.tpl
+++ b/templates/CRM/Campaign/Page/Petition.tpl
@@ -27,7 +27,9 @@
 
 {if $surveys}
   <div class="action-link">
-    {crmButton href=$addSurveyUrl icon="crm-i fa-plus-circle"}{ts}Add Survey{/ts}{/crmButton}
+    <a href="{$addSurveyUrl}" class="button">
+      <span><i class="crm-i fa-plus-circle"></i> {ts}Add Survey{/ts}</span>
+    </a>
   </div>
  {include file="CRM/common/enableDisableApi.tpl"}
  {include file="CRM/common/jsortable.tpl"}
@@ -68,5 +70,7 @@
   </div>
 {/if}
 <div class="action-link">
-  {crmButton href=$addSurveyUrl icon="crm-i fa-plus-circle"}{ts}Add Survey{/ts}{/crmButton}
+  <a href="{$addSurveyUrl}" class="button">
+    <span><i class="crm-i fa-plus-circle"></i> {ts}Add Survey{/ts}</span>
+  </a>
 </div>
diff --git a/templates/CRM/Campaign/Page/SurveyType.tpl b/templates/CRM/Campaign/Page/SurveyType.tpl
index e230ac0fc1..6f1308bc10 100644
--- a/templates/CRM/Campaign/Page/SurveyType.tpl
+++ b/templates/CRM/Campaign/Page/SurveyType.tpl
@@ -4,7 +4,7 @@
 {else}
 {if $rows}
 <div class="action-link">
-  <a href="{$addSurveyType}" class="button"><span><i class="crm-i fa-plus-circle"></i> {ts 1=$GName}Add %1{/ts}</span></a>
+  {crmButton p=$addSurveyType.0 q=$addSurveyType.1 icon="crm-i fa-plus-circle"}{ts 1=$GName}Add %1{/ts}{/crmButton}
 </div>
 
 <div id={$gName}>
@@ -41,14 +41,14 @@
         </table>
         {/strip}
         <div class="action-link">
-          <a href="{$addSurveyType}" class="button"><span><i class="crm-i fa-plus-circle"></i> {ts 1=$GName}Add %1{/ts}</span></a>
+          {crmButton p=$addSurveyType.0 q=$addSurveyType.1 icon="crm-i fa-plus-circle"}{ts 1=$GName}Add %1{/ts}{/crmButton}
         </div>
 
 </div>
 {else}
     <div class="messages status no-popup">
          <div class="icon inform-icon"> &nbsp;
-         {ts 1=$addSurveyType}There are no survey type entered. You can <a href='%1'>add one</a>.{/ts}</div>
+         {ts p=$addSurveyType.0 q=$addSurveyType.1}There are no survey types entered. You can <a href='%1'>add one</a>.{/ts}</div>
     </div>
 {/if}
 {/if}
-- 
2.25.1