) {
$froms = $tos = [];
foreach (explode(CRM_Core_DAO::VALUE_SEPARATOR, trim($from, CRM_Core_DAO::VALUE_SEPARATOR)) as $val) {
- $froms[] = CRM_Utils_Array::value($val, $values[$field]);
+ $froms[] = $values[$field][$val] ?? NULL;
}
foreach (explode(CRM_Core_DAO::VALUE_SEPARATOR, trim($to, CRM_Core_DAO::VALUE_SEPARATOR)) as $val) {
- $tos[] = CRM_Utils_Array::value($val, $values[$field]);
+ $tos[] = $values[$field][$val] ?? NULL;
}
$from = implode(', ', array_filter($froms));
$to = implode(', ', array_filter($tos));
* Store the dsn for the logging database in $this->db.
*/
protected function storeDB() {
- $dsn = defined('CIVICRM_LOGGING_DSN') ? DB::parseDSN(CIVICRM_LOGGING_DSN) : DB::parseDSN(CIVICRM_DSN);
+ $dsn = defined('CIVICRM_LOGGING_DSN') ? CRM_Utils_SQL::autoSwitchDSN(CIVICRM_LOGGING_DSN) : CRM_Utils_SQL::autoSwitchDSN(CIVICRM_DSN);
+ $dsn = DB::parseDSN($dsn);
$this->db = $dsn['database'];
}