Merge pull request #5597 from pratikshad/CRM-16008

[civicrm-core.git] / CRM / Event / BAO / Event.php

diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php
index 5018a771443b94de61326b33a81b230b82582a10..e87dd2d235cced9f64bd44cc351c101290496cd3 100644 (file)
--- a/CRM/Event/BAO/Event.php
+++ b/CRM/Event/BAO/Event.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,26 +23,26 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
 class CRM_Event_BAO_Event extends CRM_Event_DAO_Event {
 
   /**
-   * Class constructor
+   * Class constructor.
    */
   public function __construct() {
     parent::__construct();
   }
 
   /**
-   * Fetch object based on array of properties
+   * Fetch object based on array of properties.
    *
    * @param array $params
    *   (reference ) an assoc array of name/value pairs.
@@ -62,7 +62,7 @@ class CRM_Event_BAO_Event extends CRM_Event_DAO_Event {
   }
 
   /**
-   * Update the is_active flag in the db
+   * Update the is_active flag in the db.
    *
    * @param int $id
    *   Id of the database record.
@@ -77,7 +77,7 @@ class CRM_Event_BAO_Event extends CRM_Event_DAO_Event {
   }
 
   /**
-   * Add the event
+   * Add the event.
    *
    * @param array $params
    *   Reference array contains the values submitted by the form.
@@ -116,7 +116,7 @@ class CRM_Event_BAO_Event extends CRM_Event_DAO_Event {
   }
 
   /**
-   * Create the event
+   * Create the event.
    *
    * @param array $params
    *   Reference array contains the values submitted by the form.
@@ -173,7 +173,7 @@ class CRM_Event_BAO_Event extends CRM_Event_DAO_Event {
   }
 
   /**
-   * Delete the event
+   * Delete the event.
    *
    * @param int $id
    *   Event id.
@@ -311,7 +311,7 @@ WHERE  ( civicrm_event.is_template IS NULL OR civicrm_event.is_template = 0 )";
   }
 
   /**
-   * Get events Summary
+   * Get events Summary.
    *
    *
    * @return array
@@ -576,7 +576,7 @@ $event_summary_limit
   }
 
   /**
-   * Get participant count
+   * Get participant count.
    *
    * @param int $eventId
    * @param bool $considerStatus consider status for participant count.
@@ -642,7 +642,7 @@ $event_summary_limit
   }
 
   /**
-   * Get the information to map a event
+   * Get the information to map a event.
    *
    * @param int $id
    *   For which we want map info.
@@ -709,7 +709,7 @@ WHERE civicrm_address.geo_code_1 IS NOT NULL
   }
 
   /**
-   * Get the complete information for one or more events
+   * Get the complete information for one or more events.
    *
    * @param date $start
    *   Get events with start date >= this date.
@@ -1169,7 +1169,7 @@ WHERE civicrm_event.is_active = 1
           $tplParams['participant_status'] = CRM_Event_PseudoConstant::participantStatus($statusId, NULL, 'label');
         }
         //CRM-15754 - if participant_status contains status ID
-        elseif (CRM_Utils_Rule::integer($tplParams['participant_status'])) {
+        elseif (!empty($tplParams['participant_status']) && CRM_Utils_Rule::integer($tplParams['participant_status'])) {
           $tplParams['participant_status'] = CRM_Event_PseudoConstant::participantStatus($tplParams['participant_status'], NULL, 'label');
         }
 
@@ -1431,7 +1431,7 @@ WHERE civicrm_event.is_active = 1
   }
 
   /**
-   * Build the array for display the profile fields
+   * Build the array for display the profile fields.
    *
    * @param array $params
    *   Key value.
@@ -1881,7 +1881,7 @@ WHERE  ce.loc_block_id = $locBlockId";
   }
 
   /**
-   * Check if event registration is valid according to permissions AND Dates
+   * Check if event registration is valid according to permissions AND Dates.
    *
    * @param array $values
    * @param int $eventID
@@ -1992,7 +1992,7 @@ WHERE  ce.loc_block_id = $locBlockId";
   }
 
   /**
-   * Make sure that the user has permission to access this event
+   * Make sure that the user has permission to access this event.
    *
    * @param int $eventId
    * @param int $type
@@ -2137,7 +2137,7 @@ LEFT  JOIN  civicrm_price_field_value value ON ( value.id = lineItem.price_field
   }
 
   /**
-   * Retrieve event template default values to be set
+   * Retrieve event template default values to be set.
    *  as default values for current new event.
    *
    * @param int $templateId
@@ -2179,7 +2179,7 @@ LEFT  JOIN  civicrm_price_field_value value ON ( value.id = lineItem.price_field
   }
 
   /**
-   * Update the Campaign Id of all the participants of the given event
+   * Update the Campaign Id of all the participants of the given event.
    *
    * @param int $eventID
    *   Event id.