CRM-21052 - CRM_Upgrade - If site is using activity revisions, continue doing so...

diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php
index 4a3606fe5bbd254094bbb92a15e23550a060aaed..8c92c038c031897cd3f1600985744c1e35dfa6d0 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -412,6 +412,7 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base
   public function upgrade_4_7_25($rev) {
     $this->addTask("CRM-20927 - Add column to 'civicrm_menu' for additional metadata", 'addColumn',
       'civicrm_menu', 'module_data', "text COMMENT 'All other menu metadata not stored in other fields'");
+    $this->addTask('CRM-21052 - Determine activity revision policy', 'pickActivityRevisionPolicy');
     $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
   }
 
@@ -1200,6 +1201,13 @@ FROM `civicrm_dashboard_contact` JOIN `civicrm_contact` WHERE civicrm_dashboard_
     return TRUE;
   }
 
+  public static function pickActivityRevisionPolicy(CRM_Queue_TaskContext $ctx) {
+    // CRM-21052 - If site is using activity revisions, continue doing so. Otherwise, switch out.
+    $count = CRM_Core_DAO::singleValueQuery('SELECT count(*) FROM civicrm_activity WHERE is_current_revision = 0 OR original_id IS NOT NULL');
+    Civi::settings()->set('civicaseActivityRevisions', $count > 0);
+    return TRUE;
+  }
+
   /**
    * @return bool
    */

diff --git a/settings/Case.setting.php b/settings/Case.setting.php
index 9d5288b62d1f2b17b6671fd0de3ecc9ee72ba69a..77ada717515530e7992d92f5ef79244ba79cdff4 100644 (file)
--- a/settings/Case.setting.php
+++ b/settings/Case.setting.php
@@ -106,7 +106,7 @@ return array(
     'name' => 'civicaseActivityRevisions',
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
-    'default' => TRUE,
+    'default' => FALSE,
     'html_type' => 'radio',
     'add' => '4.7',
     'title' => 'Enable Embedded Activity Revisions',