Merge pull request #20937 from civicrm/5.40

5.40
civicrm · Jul 23, 2021 · 2108bda · 2108bda
2 parents 114d069 + 814bd1f
commit 2108bda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CRM/Contact/BAO/GroupContactCache.php b/CRM/Contact/BAO/GroupContactCache.php
@@ -129,6 +129,8 @@ public static function loadAll($groupIDs = NULL, $limit = 0) {
       $groupIDs = (array) $groupIDs;
     }
 
+    // Treat the default help text in Scheduled Jobs as equivalent to no limit.
+    $limit = (int) $limit;
     $processGroupIDs = self::getGroupsNeedingRefreshing($groupIDs, $limit);
 
     if (!empty($processGroupIDs)) {

diff --git a/install/civicrm.php b/install/civicrm.php
@@ -89,7 +89,7 @@ function civicrm_main(&$config) {
   civicrm_source($dsn, $sqlPath . DIRECTORY_SEPARATOR . 'civicrm.mysql');
 
   if (!empty($config['loadGenerated'])) {
-    civicrm_source($dsn, $sqlPath . DIRECTORY_SEPARATOR . 'civicrm_generated.mysql', TRUE);
+    civicrm_source($dsn, $sqlPath . DIRECTORY_SEPARATOR . 'civicrm_generated.mysql');
   }
   else {
     if (isset($config['seedLanguage'])