Merge pull request #5760 from sudhabisht/SMSissue

[civicrm-core.git] / CRM / Core / Action.php

diff --git a/CRM/Core/Action.php b/CRM/Core/Action.php
index a31f1883a96b6943b77e8fd9c814ea20a3ded79b..25cac391052f5e04c923776b80d915eab26c3adc 100644 (file)
--- a/CRM/Core/Action.php
+++ b/CRM/Core/Action.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,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * The core concept of the system is an action performed on an object. Typically this will be a "data model" object
@@ -31,7 +31,7 @@
  * and similar across all objects (thus providing both reuse and standards)
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -105,7 +105,7 @@ class CRM_Core_Action {
   static $_description;
 
   /**
-   * Called by the request object to translate a string into a mask
+   * Called by the request object to translate a string into a mask.
    *
    * @param string $str
    *   The action to be resolved.
@@ -147,7 +147,7 @@ class CRM_Core_Action {
   }
 
   /**
-   * Given a string determine the bitmask for this specific string
+   * Given a string determine the bitmask for this specific string.
    *
    * @param string $item
    *   The input action to process.
@@ -200,7 +200,7 @@ class CRM_Core_Action {
    * @return string
    *   the html string
    */
-  static function formLink(
+  public static function formLink(
     $links,
     $mask,
     $values,
@@ -321,8 +321,6 @@ class CRM_Core_Action {
   /**
    * Get the mask for a permission (view, edit or null)
    *
-   * @param string the permission
-   *
    * @return int
    *   the mask for the above permission
    */
@@ -346,4 +344,5 @@ class CRM_Core_Action {
 
     return $mask;
   }
+
 }