Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-08-20-42-29

[civicrm-core.git] / CRM / Core / Permission / Drupal6.php

diff --git a/CRM/Core/Permission/Drupal6.php b/CRM/Core/Permission/Drupal6.php
index 8027cd1c4fd99f562e845c35747f374eca5403d0..2b14cb61cc2c7cbbe055df563d78bc3a43fa1a50 100644 (file)
--- a/CRM/Core/Permission/Drupal6.php
+++ b/CRM/Core/Permission/Drupal6.php
@@ -66,6 +66,8 @@ class CRM_Core_Permission_Drupal6 extends CRM_Core_Permission_DrupalBase {
    *
    * @param string $str the permission to check
    *
+   * @param null $contactID
+   *
    * @return boolean true if yes, else false
    * @access public
    */
@@ -194,6 +196,8 @@ class CRM_Core_Permission_Drupal6 extends CRM_Core_Permission_DrupalBase {
    * Get the permissions defined in the hook_civicrm_permission implementation
    * of the given module.
    *
+   * @param $module
+   *
    * @return Array of permissions, in the same format as CRM_Core_Permission::getCorePermissions().
    */
   static function getModulePermissions($module) {