From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 3 Dec 2015 19:41:37 +0000 (-0500)
Subject: Fix broken table in languages other than English
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c740f57bff0edae326270aa0bf29aa6a5f33c7d1;p=civicrm-core.git

Fix broken table in languages other than English

Table layout was broken because code was relying on english label "Soft Credit For".
There may well be a better way to do this, but at least it's not as broken as before.
---

diff --git a/CRM/Contribute/Selector/Search.php b/CRM/Contribute/Selector/Search.php
index d7c007b8af..7839b11325 100644
--- a/CRM/Contribute/Selector/Search.php
+++ b/CRM/Contribute/Selector/Search.php
@@ -559,6 +559,7 @@ class CRM_Contribute_Selector_Search extends CRM_Core_Selector_Base implements C
           array('desc' => ts('Actions')),
         )
       );
+    CRM_Core_Smarty::singleton()->assign('softCreditColumns', $this->_includeSoftCredits);
     return self::$_columnHeaders;
   }
 
diff --git a/templates/CRM/Contribute/Form/Selector.tpl b/templates/CRM/Contribute/Form/Selector.tpl
index 7097f28761..ceb19bb823 100644
--- a/templates/CRM/Contribute/Form/Selector.tpl
+++ b/templates/CRM/Contribute/Form/Selector.tpl
@@ -32,7 +32,6 @@
       {if !$single and $context eq 'Search' }
         <th scope="col" title="Select Rows">{$form.toggleSelect.html}</th>
       {/if}
-      {assign var="softCreditColumns" value=0}
       {foreach from=$columnHeaders item=header}
         <th scope="col">
           {if $header.sort}
@@ -42,9 +41,6 @@
             {$header.name}
           {/if}
         </th>
-        {if $header.name eq "Soft Credit For"}
-          {assign var='softCreditColumns' value=1}
-        {/if}
       {/foreach}
     </tr>
     </thead>