From bd63f1b1388fcb89afdf912b8862be9e94d46f7f Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 3 Dec 2015 14:41:37 -0500
Subject: [PATCH] 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.

Conflicts:
	templates/CRM/Contribute/Form/Selector.tpl
---
 CRM/Contribute/Selector/Search.php         | 1 +
 templates/CRM/Contribute/Form/Selector.tpl | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/CRM/Contribute/Selector/Search.php b/CRM/Contribute/Selector/Search.php
index 875629a6a7..de5c9ae902 100644
--- a/CRM/Contribute/Selector/Search.php
+++ b/CRM/Contribute/Selector/Search.php
@@ -533,6 +533,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 10240d77cc..4ff2e54f15 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>
-- 
2.25.1