Merge pull request #3004 from sgladstone/master

[civicrm-core.git] / CRM / Friend / Form / Contribute.php

diff --git a/CRM/Friend/Form/Contribute.php b/CRM/Friend/Form/Contribute.php
index ddfc05524e7d22e0f0969a9a56821647fefa2353..1dc150ae973bf7f36edf4dea14dd08730e79d84a 100644 (file)
--- a/CRM/Friend/Form/Contribute.php
+++ b/CRM/Friend/Form/Contribute.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -44,7 +44,7 @@ class CRM_Friend_Form_Contribute extends CRM_Contribute_Form_ContributionPage {
    *
    * @var int
    */
-  private $_friendId;
+  public $_friendId;
 
   public function preProcess() {
     parent::preProcess();
@@ -56,7 +56,7 @@ class CRM_Friend_Form_Contribute extends CRM_Contribute_Form_ContributionPage {
    *
    * @access public
    *
-   * @return None
+   * @return void
    */
   public function setDefaultValues() {
     $title = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_ContributionPage', $this->_id, 'title');
@@ -89,10 +89,17 @@ class CRM_Friend_Form_Contribute extends CRM_Contribute_Form_ContributionPage {
   /**
    * Function to build the form
    *
-   * @return None
+   * @return void
    * @access public
    */
   public function buildQuickForm() {
+    if (isset($this->_id)) {
+      $defaults['entity_table'] = 'civicrm_contribution_page';
+      $defaults['entity_id'] = $this->_id;
+      CRM_Friend_BAO_Friend::getValues($defaults);
+      $this->_friendId = CRM_Utils_Array::value('id', $defaults);
+    }
+
     CRM_Friend_BAO_Friend::buildFriendForm($this);
     parent::buildQuickForm();
   }
@@ -102,7 +109,7 @@ class CRM_Friend_Form_Contribute extends CRM_Contribute_Form_ContributionPage {
    *
    * @access public
    *
-   * @return None
+   * @return void
    */
   public function postProcess() {
     // get the submitted form values.