Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-11-14-11-21-50

[civicrm-core.git] / CRM / Contact / Form / Edit / Lock.php

diff --git a/CRM/Contact/Form/Edit/Lock.php b/CRM/Contact/Form/Edit/Lock.php
index 26a0fbde8487739b1b89756cb00583ed7aa74f40..ff43ac489af26b71f1ff2f4d3c80fd5e031d6531 100644 (file)
--- a/CRM/Contact/Form/Edit/Lock.php
+++ b/CRM/Contact/Form/Edit/Lock.php
@@ -43,7 +43,8 @@ class CRM_Contact_Form_Edit_Lock {
    * This function provides the HTML form elements
    *
    * @param object $form form object
-   * @param int $inlineEditMode ( 1 for contact summary
+   *
+   * @internal param int $inlineEditMode ( 1 for contact summary
    * top bar form and 2 for display name edit )
    *
    * @access public
@@ -56,9 +57,11 @@ class CRM_Contact_Form_Edit_Lock {
   /**
    * Ensure that modified_date hasn't changed in the underlying DB
    *
-   * @param array $fields  the input form values
-   * @param array $files   the uploaded files if any
-   * @param array $options additional user data
+   * @param array $fields the input form values
+   * @param array $files the uploaded files if any
+   * @param null $contactID
+   *
+   * @internal param array $options additional user data
    *
    * @return true if no errors, else array of errors
    * @access public