projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-16-01-08-03
[civicrm-core.git]
/
CRM
/
Contact
/
Form
/
Edit
/
Individual.php
diff --git
a/CRM/Contact/Form/Edit/Individual.php
b/CRM/Contact/Form/Edit/Individual.php
index 8df832970ca9c33cab91e0d9ab13eb3a7824f4a6..d31b66e261256ce0876a3787cd6e7700931b0c75 100644
(file)
--- a/
CRM/Contact/Form/Edit/Individual.php
+++ b/
CRM/Contact/Form/Edit/Individual.php
@@
-128,7
+128,7
@@
class CRM_Contact_Form_Edit_Individual {
$form->assign('checkSimilar', $checkSimilar);
//External Identifier Element
$form->assign('checkSimilar', $checkSimilar);
//External Identifier Element
- $form->add('text', 'external_identifier', ts('External I
d
'),
+ $form->add('text', 'external_identifier', ts('External I
D
'),
CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Contact', 'external_identifier'), FALSE
);
CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Contact', 'external_identifier'), FALSE
);
@@
-143,13
+143,11
@@
class CRM_Contact_Form_Edit_Individual {
}
/**
}
/**
- *
g
lobal form rule
+ *
G
lobal form rule
*
* @param array $fields the input form values
* @param array $files the uploaded files if any
*
* @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
+ * @param int $contactID
*
* @return true if no errors, else array of errors
* @access public
*
* @return true if no errors, else array of errors
* @access public