Multilingual upgrader fixes

Author: colemanw

CRM/Core/I18n/Schema.php

@@ -315,15 +315,14 @@ public static function rebuildMultilingualSchema($locales, $version = NULL, $isU
       }
     }
 
-    // rebuild triggers
-    $last = array_pop($locales);
-
     foreach ($queries as $query) {
       $dao->query($query, FALSE);
     }
 
     // invoke the meta trigger creation call
-    CRM_Core_DAO::triggerRebuild();
+    if (!$isUpgradeMode) {
+      CRM_Core_DAO::triggerRebuild();
+    }
   }
 
   /**

CRM/Upgrade/Incremental/Base.php

@@ -409,7 +409,7 @@ public static function alterSchemaField($ctx, string $entityName, string $fieldN
     if ($position) {
       $fieldSql .= " $position";
     }
-    if (CRM_Core_BAO_SchemaHandler::checkIfFieldExists($tableName, $fieldName, FALSE)) {
+    if (CRM_Core_BAO_SchemaHandler::checkIfFieldExists($tableName, $fieldName)) {
       return self::alterColumn($ctx, $tableName, $fieldName, $fieldSql, !empty($fieldSpec['localizable']));
     }
     else {

ext/financialacls/tests/phpunit/Civi/Financialacls/MembershipTypesTest.php

@@ -61,12 +61,12 @@ public function testMembershipTypePage(): void {
   protected function setUpMembershipTypesACLLimited(): Result {
     $types = MembershipType::save(FALSE)
       ->setRecords([
-        ['name' => 'Forbidden', 'financial_type_id:name' => 'Member Dues', 'weight' => 1],
-        ['name' => 'Go for it', 'financial_type_id:name' => 'Donation', 'weight' => 2],
+        ['title' => 'Forbidden', 'financial_type_id:name' => 'Member Dues', 'weight' => 1],
+        ['title' => 'Go for it', 'financial_type_id:name' => 'Donation', 'weight' => 2],
       ])
       ->setDefaults(['period_type' => 'rolling', 'member_of_contact_id' => 1, 'duration_unit' => 'month'])
       ->execute()
-      ->indexBy('name');
+      ->indexBy('title');
     $this->setupLoggedInUserWithLimitedFinancialTypeAccess();
     return $types;
   }