Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-26-14-28-00

[civicrm-core.git] / CRM / Contact / Form / Task.php

diff --git a/CRM/Contact/Form/Task.php b/CRM/Contact/Form/Task.php
index 7bce1b4c08a755a452695be2c74e19fc2cad9685..1d1228e9f12bf5ab10a6fa431399ebb8b6511d76 100644 (file)
--- a/CRM/Contact/Form/Task.php
+++ b/CRM/Contact/Form/Task.php
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -340,7 +340,7 @@ class CRM_Contact_Form_Task extends CRM_Core_Form {
   }
 
   /**
-   * Build the form object
+   * Build the form object.
    */
   public function buildQuickForm() {
     $this->addDefaultButtons(ts('Confirm Action'));
@@ -381,10 +381,8 @@ class CRM_Contact_Form_Task extends CRM_Core_Form {
 
   /**
    * Replace ids of household members in $this->_contactIds with the id of their household.
-   * CRM-8338
-   *
    *
-   * @return void
+   * CRM-8338
    */
   public function mergeContactIdsByHousehold() {
     if (empty($this->_contactIds)) {
@@ -446,4 +444,5 @@ class CRM_Contact_Form_Task extends CRM_Core_Form {
       $householdsDAO->free();
     }
   }
+
 }