Additional fixes

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 6191c4ebd1ba91c6f04ef5342e73d78f8c399e89..3a04db6af6c5c84dd96204732be2bb322e770331 100644 (file)
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -586,7 +586,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
       // Recursively set defaults for nested fields
       if (isset($contact[$name]) && is_array($contact[$name]) && ($name == 'onbehalf' || $name == 'honor')) {
         foreach ($contact[$name] as $fieldName => $fieldValue) {
-          if (is_array($fieldValue)) {
+          if (is_array($fieldValue) && !in_array($this->_fields[$name][$fieldName]['html_type'], array('Multi-Select','AdvMulti-Select'))) {
             foreach ($fieldValue as $key => $value) {
               $defaults["{$name}[{$fieldName}][{$key}]"] = $value;
             }

diff --git a/templates/CRM/UF/Form/Block.tpl b/templates/CRM/UF/Form/Block.tpl
index e49f3c257791f892c7bd2afa92c518f3195b56f2..df4489e9c52fdde78c2b9bf6d97f53846afaaecf 100644 (file)
--- a/templates/CRM/UF/Form/Block.tpl
+++ b/templates/CRM/UF/Form/Block.tpl
@@ -72,7 +72,7 @@
         {/if}
         {if $field.options_per_line != 0}
           <div class="crm-section editrow_{$n}-section form-item" id="editrow-{$n}">
-            <div class="label option-label">{$form.$n.label}</div>
+            <div class="label option-label">{if $prefix}{$form.$prefix.$n.label}{else}{$form.$n.label}{/if}</div>
             <div class="content 3">
               {assign var="count" value="1"}
               {strip}
@@ -80,11 +80,16 @@
                 <tr>
                 {* sort by fails for option per line. Added a variable to iterate through the element array*}
                   {assign var="index" value="1"}
-                  {foreach name=outer key=key item=item from=$form.$n}
+                  {if $prefix}
+                    {assign var="formElement" value=$form.$prefix.$n}
+                  {else}
+                    {assign var="formElement" value=$form.$n}
+                  {/if}
+                  {foreach name=outer key=key item=item from=$formElement}
                     {if $index < 10}
                       {assign var="index" value=`$index+1`}
                     {else}
-                      <td class="labels font-light">{$form.$n.$key.html}</td>
+                      <td class="labels font-light">{$formElement.$key.html}</td>
                       {if $count == $field.options_per_line}
                       </tr>
                       <tr>
@@ -178,4 +183,4 @@
     $('#selector tr:odd ').addClass('even-row');
   });
 </script>
-{/literal}
+{/literal}{debug}