Merge pull request #3727 from monishdeb/CRM-14875

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

diff --git a/CRM/Core/Action.php b/CRM/Core/Action.php
index f619f75e032bc2824f87c04b9aab84256ef530d4..e1de9c1f270556dd337c9f548f832f5265c48a76 100644 (file)
--- a/CRM/Core/Action.php
+++ b/CRM/Core/Action.php
@@ -41,7 +41,7 @@ class CRM_Core_Action {
    * Different possible actions are defined here. Keep in sync with the
    * constant from CRM_Core_Form for various modes.
    *
-   * @var const
+   * @var integer const
    *
    * @access public
    */
@@ -114,12 +114,13 @@ class CRM_Core_Action {
    *
    * called by the request object to translate a string into a mask
    *
-   * @param string $action the action to be resolved
+   * @param $str
+   *
+   * @internal param string $action the action to be resolved
    *
    * @return int the action mask corresponding to the input string
    * @access public
    * @static
-   *
    */
   static function resolve($str) {
     $action = 0;
@@ -193,11 +194,15 @@ class CRM_Core_Action {
    * given a set of links and a mask, return the html action string for
    * the links associated with the mask
    *
-   * @param array $links  the set of link items
-   * @param int   $mask   the mask to be used. a null mask means all items
+   * @param array $links the set of link items
+   * @param int $mask the mask to be used. a null mask means all items
    * @param array $values the array of values for parameter substitution in the link items
-   * @param string  $extraULName            enclosed extra links in this UL.
-   * @param boolean $enclosedAllInSingleUL  force to enclosed all links in single UL.
+   * @param string $extraULName enclosed extra links in this UL.
+   * @param boolean $enclosedAllInSingleUL force to enclosed all links in single UL.
+   *
+   * @param null $op
+   * @param null $objectName
+   * @param null $objectId
    *
    * @return string       the html string
    * @access public