From: Jamie McClelland <jm@mayfirst.org>
Date: Mon, 15 Sep 2014 14:44:46 +0000 (-0400)
Subject: CRM-15270 - cleaning code and future proofing on lobo's suggestion
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=db70b3234f854d1c83daeaa14af16542e096c926;p=civicrm-core.git

CRM-15270 - cleaning code and future proofing on lobo's suggestion

See https://github.com/civicrm/civicrm-core/pull/4090/files#r17368220

----------------------------------------
* CRM-15270: Enabling logging result in database error
  https://issues.civicrm.org/jira/browse/CRM-15270
---

diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php
index d1dd719cc9..b67d3af955 100644
--- a/CRM/Logging/Schema.php
+++ b/CRM/Logging/Schema.php
@@ -74,12 +74,9 @@ AND    TABLE_NAME LIKE 'civicrm_%'
     $this->tables = preg_grep('/^civicrm_import_job_/', $this->tables, PREG_GREP_INVERT);
     $this->tables = preg_grep('/_cache$/', $this->tables, PREG_GREP_INVERT);
     $this->tables = preg_grep('/_log/', $this->tables, PREG_GREP_INVERT);
-    $this->tables = preg_grep('/^civicrm_task_action_temp_/', $this->tables, PREG_GREP_INVERT);
-    $this->tables = preg_grep('/^civicrm_export_temp_/', $this->tables, PREG_GREP_INVERT);
     $this->tables = preg_grep('/^civicrm_queue_/', $this->tables, PREG_GREP_INVERT);
     $this->tables = preg_grep('/^civicrm_menu/', $this->tables, PREG_GREP_INVERT); //CRM-14672
-    $this->tables = preg_grep('/^civicrm_report_temp_/', $this->tables, PREG_GREP_INVERT);
-    $this->tables = preg_grep('/^civicrm_temp_/', $this->tables, PREG_GREP_INVERT);
+    $this->tables = preg_grep('/_temp_/', $this->tables, PREG_GREP_INVERT);
 
     // do not log civicrm_mailing_event* tables, CRM-12300
     $this->tables = preg_grep('/^civicrm_mailing_event_/', $this->tables, PREG_GREP_INVERT);