Merge pull request #4962 from totten/master-angular-ts

[civicrm-core.git] / CRM / Core / BAO / OptionGroup.php

diff --git a/CRM/Core/BAO/OptionGroup.php b/CRM/Core/BAO/OptionGroup.php
index eb526146054479c522f14483719a42ddb1b78706..883828e743a2ed3eda83d3c2a16cffd26276466e 100644 (file)
--- a/CRM/Core/BAO/OptionGroup.php
+++ b/CRM/Core/BAO/OptionGroup.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        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -49,8 +49,7 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup {
    * @param array $defaults
    *   (reference ) an assoc array to hold the flattened values.
    *
-   * @return CRM_Core_BAO_OptionGroup object
-   * @static
+   * @return CRM_Core_BAO_OptionGroup
    */
   public static function retrieve(&$params, &$defaults) {
     $optionGroup = new CRM_Core_DAO_OptionGroup();
@@ -70,8 +69,8 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup {
    * @param bool $is_active
    *   Value we want to set the is_active field.
    *
-   * @return Object             DAO object on sucess, null otherwise
-   * @static
+   * @return Object
+   *   DAO object on sucess, null otherwise
    */
   public static function setIsActive($id, $is_active) {
     return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_OptionGroup', $id, 'is_active', $is_active);
@@ -85,12 +84,11 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup {
    * @param array $ids
    *   Reference array contains the id.
    *
-   * @static
    *
    * @return object
    */
   public static function add(&$params, $ids = array()) {
-    if(empty($params['id'])){
+    if (empty($params['id'])) {
       $params['id'] = CRM_Utils_Array::value('optionGroup', $ids);
     }
 
@@ -115,10 +113,6 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup {
    *
    * @param int $optionGroupId
    *   Id of the Option Group to be deleted.
-   *
-   * @return void
-   *
-   * @static
    */
   public static function del($optionGroupId) {
     // need to delete all option value field before deleting group
@@ -137,9 +131,8 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup {
    * @param int $optionGroupId
    *   Id of the Option Group.
    *
-   * @return String title
-   *
-   * @static
+   * @return string
+   *   title
    */
   public static function getTitle($optionGroupId) {
     $optionGroup = new CRM_Core_DAO_OptionGroup();
@@ -147,4 +140,5 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup {
     $optionGroup->find(TRUE);
     return $optionGroup->name;
   }
+
 }