CRM-18163, fixed problem related to CRM-15182

----------------------------------------
* CRM-18163: Unsupervised Organization Rule for On Behalf Of Contributions
  https://issues.civicrm.org/jira/browse/CRM-18163
* CRM-15182: on behalf of: preloaded org is not preserved
  https://issues.civicrm.org/jira/browse/CRM-15182

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 062305e35b2e993ff5c97bbe22ec0b18bc970051..914cbf1126fe4ba997c1fabac3553d8db6e7c277 100644 (file)
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -223,6 +223,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
     }
     // if onbehalf-of-organization
     if (!empty($this->_values['onbehalf_profile_id']) && !empty($this->_params['onbehalf']['organization_name'])) {
+      $this->_params['organization_id'] = CRM_Utils_Array::value('onbehalfof_id', $this->_params);
       $this->_params['organization_name'] = $this->_params['onbehalf']['organization_name'];
       $addressBlocks = array(
         'street_address',