Merge pull request #23707 from eileenmcnaughton/import_activity

[civicrm-core.git] / CRM / Logging / Reverter.php

diff --git a/CRM/Logging/Reverter.php b/CRM/Logging/Reverter.php
index 72d729d03af6149c9c0fd21002d35f0241543d31..9d65c0c93875f2a9876c1091edb83614f5688a20 100644 (file)
--- a/CRM/Logging/Reverter.php
+++ b/CRM/Logging/Reverter.php
@@ -33,7 +33,8 @@ class CRM_Logging_Reverter {
    * @param $log_date
    */
   public function __construct($log_conn_id, $log_date) {
-    $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'];
     $this->log_conn_id = $log_conn_id;
     $this->log_date = $log_date;
@@ -139,7 +140,7 @@ class CRM_Logging_Reverter {
 
         // custom data tables
 
-        case in_array($table, array_keys($ctypes)):
+        case array_key_exists($table, $ctypes):
           foreach ($row as $id => $changes) {
             $inserts = ['id' => '%1'];
             $updates = [];