Merge pull request #17750 from colemanw/upgradeBump

Bump minimum upgradable version to 4.4.7
civicrm · Jul 7, 2020 · 004eff0 · 004eff0
2 parents 6c2159b + fdc2e63
commit 004eff0
Show file tree

Hide file tree

Showing 72 changed files with 2 additions and 12,470 deletions.
diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
@@ -3401,15 +3401,6 @@ public static function getTimestamps($contactId) {
    * @see CRM_Core_DAO::triggerRebuild
    */
   public static function triggerInfo(&$info, $tableName = NULL) {
-    //during upgrade, first check for valid version and then create triggers
-    //i.e the columns created_date and modified_date are introduced in 4.3.alpha1 so dont create triggers for older version
-    if (CRM_Core_Config::isUpgradeMode()) {
-      $currentVer = CRM_Core_BAO_Domain::version(TRUE);
-      //if current version is less than 4.3.alpha1 dont create below triggers
-      if (version_compare($currentVer, '4.3.alpha1') < 0) {
-        return;
-      }
-    }
 
     // Modifications to these records should update the contact timestamps.
     \Civi\Core\SqlTrigger\TimestampTriggers::create('civicrm_contact', 'Contact')

diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php
@@ -1665,11 +1665,6 @@ public static function getWeight($ufGroupId = NULL) {
   public static function getModuleUFGroup($moduleName = NULL, $count = 0, $skipPermission = TRUE, $op = CRM_Core_Permission::VIEW, $returnFields = NULL) {
     $selectFields = ['id', 'title', 'created_id', 'is_active', 'is_reserved', 'group_type'];
 
-    if (CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_uf_group', 'description')) {
-      // CRM-13555, since description field was added later (4.4), and to avoid any problems with upgrade
-      $selectFields[] = 'description';
-    }
-
     if (CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_uf_group', 'frontend_title')) {
       $selectFields[] = 'frontend_title';
     }

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
@@ -927,6 +927,7 @@ public static function objectExists($value, $daoName, $daoID, $fieldName = 'name
    *   true if exists, else false
    */
   public static function checkFieldExists($tableName, $columnName, $i18nRewrite = TRUE) {
+    CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_BAO_SchemaHandler::checkIfFieldExists');
     return CRM_Core_BAO_SchemaHandler::checkIfFieldExists($tableName, $columnName, $i18nRewrite);
   }
 

diff --git a/CRM/Upgrade/4.3.5.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.3.5.msg_template/civicrm_msg_template.tpl