projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '5.26' of https://github.com/civicrm/civicrm-core
[civicrm-core.git]
/
CRM
/
Campaign
/
BAO
/
Survey.php
diff --git
a/CRM/Campaign/BAO/Survey.php
b/CRM/Campaign/BAO/Survey.php
index 810cec0d4a09b2e7c154ce9e8ce28d92453b750c..93b487982be9d7366851a1cc25296566c28f7dbe 100644
(file)
--- a/
CRM/Campaign/BAO/Survey.php
+++ b/
CRM/Campaign/BAO/Survey.php
@@
-62,36
+62,19
@@
class CRM_Campaign_BAO_Survey extends CRM_Campaign_DAO_Survey {
CRM_Core_DAO::executeQuery($query);
}
CRM_Core_DAO::executeQuery($query);
}
- if (!(CRM_Utils_Array::value('id', $params))) {
-
- if (!(CRM_Utils_Array::value('created_id', $params))) {
- $session = CRM_Core_Session::singleton();
- $params['created_id'] = $session->get('userID');
+ if (empty($params['id'])) {
+ if (empty($params['created_id'])) {
+ $params['created_id'] = CRM_Core_Session::getLoggedInContactID();
}
}
- if (!(CRM_Utils_Array::value('created_date', $params))) {
+
+ if (empty($params['created_date'])) {
$params['created_date'] = date('YmdHis');
}
$params['created_date'] = date('YmdHis');
}
-
- CRM_Utils_Hook::pre('create', 'Survey', NULL, $params);
}
}
- else {
- CRM_Utils_Hook::pre('edit', 'Survey', $params['id'], $params);
- }
-
- $dao = new CRM_Campaign_DAO_Survey();
- $dao->copyValues($params);
- $dao->save();
- if (!empty($params['id'])) {
- CRM_Utils_Hook::post('edit', 'Survey', $dao->id, $dao);
- }
- else {
- CRM_Utils_Hook::post('create', 'Survey', $dao->id, $dao);
- }
+ $dao = self::writeRecord($params);
- if (!empty($params['custom']) &&
- is_array($params['custom'])
- ) {
+ if (!empty($params['custom']) && is_array($params['custom'])) {
CRM_Core_BAO_CustomValueTable::store($params['custom'], 'civicrm_survey', $dao->id);
}
return $dao;
CRM_Core_BAO_CustomValueTable::store($params['custom'], 'civicrm_survey', $dao->id);
}
return $dao;
@@
-886,7
+869,7
@@
INNER JOIN civicrm_contact contact_a ON ( activityTarget.contact_id = contact_a
}
}
}
}
- return
CRM_Utils_Array::value($surveyId, $ufIds)
;
+ return
$ufIds[$surveyId] ?? NULL
;
}
/**
}
/**