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
/
Import
/
ImportJob.php
diff --git
a/CRM/Contact/Import/ImportJob.php
b/CRM/Contact/Import/ImportJob.php
index 3d45cacd2c88ea0be3c15e736016825736bb10f9..ffb58217c4a7434baab34d8279e499e131042a20 100644
(file)
--- a/
CRM/Contact/Import/ImportJob.php
+++ b/
CRM/Contact/Import/ImportJob.php
@@
-152,7
+152,7
@@
class CRM_Contact_Import_ImportJob {
}
/**
}
/**
- * @param $params
+ * @param
array
$params
*/
public function setJobParams(&$params) {
foreach ($params as $param => $value) {
*/
public function setJobParams(&$params) {
foreach ($params as $param => $value) {
@@
-162,7
+162,7
@@
class CRM_Contact_Import_ImportJob {
}
/**
}
/**
- * @param $form
+ * @param
CRM_Core_Form
$form
* @param int $timeout
*/
public function runImport(&$form, $timeout = 55) {
* @param int $timeout
*/
public function runImport(&$form, $timeout = 55) {
@@
-339,7
+339,7
@@
class CRM_Contact_Import_ImportJob {
/**
* @param $contactIds
/**
* @param $contactIds
- * @param $newGroupName
+ * @param
string
$newGroupName
* @param $newGroupDesc
*
* @return array|bool
* @param $newGroupDesc
*
* @return array|bool
@@
-392,7
+392,7
@@
class CRM_Contact_Import_ImportJob {
/**
* @param $contactIds
/**
* @param $contactIds
- * @param $newTagName
+ * @param
string
$newTagName
* @param $newTagDesc
*
* @return array|bool
* @param $newTagDesc
*
* @return array|bool