Further comment fixes

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index ffd6181f9d8b2d79fa6b8cf36f74e61f9d1c62a6..2fc620b187f073d0769776e8494f26d7b689cd94 100644 (file)
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1765,13 +1765,13 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
   }
 
   /**
-   * Function used to send notification mail to pcp owner
-   * This is used by contribution and also event pcps
+   * Function used to send notification mail to pcp owner.
+   *
+   * This is used by contribution and also event PCPs.
    *
    * @param object $contribution
    * @param object $contributionSoft
    *   Contribution object.
-   *
    */
 
   public static function pcpNotifyOwner($contribution, $contributionSoft) {

diff --git a/CRM/Upgrade/Incremental/php/FourSix.php b/CRM/Upgrade/Incremental/php/FourSix.php
index 1b25a5309ce14746eeb4cdfa77bcad98dbc3a875..d7d3222548996eb7fcd60816a385af7f0f73a0ca 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourSix.php
+++ b/CRM/Upgrade/Incremental/php/FourSix.php
@@ -29,12 +29,13 @@
  * @package CRM
  * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
- *
  */
 class CRM_Upgrade_Incremental_php_FourSix {
   const BATCH_SIZE = 5000;
 
   /**
+   * Verify DB state.
+   *
    * @param $errors
    *
    * @return bool
@@ -44,7 +45,7 @@ class CRM_Upgrade_Incremental_php_FourSix {
   }
 
   /**
-   * Compute any messages which should be displayed beforeupgrade
+   * Compute any messages which should be displayed before upgrade.
    *
    * Note: This function is called iteratively for each upcoming
    * revision to the database.
@@ -53,8 +54,6 @@ class CRM_Upgrade_Incremental_php_FourSix {
    * @param string $rev
    *   a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'.
    * @param null $currentVer
-   *
-   * @return void
    */
   public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) {
   }
@@ -117,7 +116,7 @@ class CRM_Upgrade_Incremental_php_FourSix {
    *
    * @param string $rev
    */
-  function upgrade_4_6_alpha3($rev) {
+  public function upgrade_4_6_alpha3($rev) {
     // Task to process sql.
     $this->addTask(ts('Add and update reference_date column for Schedule Reminders'), 'updateReferenceDate');
   }
@@ -131,8 +130,8 @@ class CRM_Upgrade_Incremental_php_FourSix {
    *
    * @return bool
    */
-  static function updateReferenceDate(CRM_Queue_TaskContext $ctx) {
-    //Add column civicrm_action_log.reference_date if not exists
+  public static function updateReferenceDate(CRM_Queue_TaskContext $ctx) {
+    //Add column civicrm_action_log.reference_date if not exists.
     $sql = "SELECT count(*) FROM information_schema.columns WHERE table_schema = database() AND table_name = 'civicrm_action_log' AND COLUMN_NAME = 'reference_date' ";
     $res = CRM_Core_DAO::singleValueQuery($sql);
 
@@ -142,7 +141,7 @@ class CRM_Upgrade_Incremental_php_FourSix {
       CRM_Core_DAO::executeQuery($query);
     }
 
-    //Retrieve schedule reminders for membership entity and is not repeatable and no absolute date chosen
+    //Retrieve schedule reminders for membership entity and is not repeatable and no absolute date chosen.
     $query = "SELECT schedule.* FROM civicrm_action_schedule schedule
  LEFT JOIN civicrm_action_mapping mapper ON mapper.id = schedule.mapping_id AND
    mapper.entity = 'civicrm_membership' AND
@@ -151,10 +150,10 @@ class CRM_Upgrade_Incremental_php_FourSix {
 
     // construct basic where clauses
     $where = array(
-      'reminder.action_date_time >= DATE_SUB(reminder.action_date_time, INTERVAL 9 MONTH)'
+      'reminder.action_date_time >= DATE_SUB(reminder.action_date_time, INTERVAL 9 MONTH)',
     ); //choose reminder older then 9 months
     $dao = CRM_Core_DAO::executeQuery($query);
-    while($dao->fetch()) {
+    while ($dao->fetch()) {
 
       $referenceColumn = str_replace('membership_', "m.", $dao->start_action_date);
       $value = implode(', ', explode(CRM_Core_DAO::VALUE_SEPARATOR, trim($dao->entity_value, CRM_Core_DAO::VALUE_SEPARATOR)));
@@ -182,4 +181,5 @@ class CRM_Upgrade_Incremental_php_FourSix {
 
     return TRUE;
   }
+
 }