System: merge v27.0.01 into v28.0.00

# Conflicts: # CHANGEDB.php # CHANGELOG.txt # gibbon.sql # version.php
GibbonEdu · Jun 7, 2024 · 8049d7e · 8049d7e
2 parents 8cc5e97 ad7efd2
commit 8049d7e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/CHANGEDB.php b/CHANGEDB.php
@@ -812,6  812,11 @@
 ALTER TABLE `gibbonMessenger` ADD `enableSharingLink` ENUM('N','Y') NOT NULL DEFAULT 'N';end
 ";
 
 //v27.0.01
   $count;
 $sql[$count][0] = '27.0.01';
 $sql[$count][1] = "";
 
 //v28.0.00
   $count;
 $sql[$count][0] = '28.0.00';

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -33,11  33,17 @@ v28.0.00
         Attendance: added an index to the attendance log to help speed up attendance pages
         Markbook: updated markbook columns to grey out students who joined after the Go Live date
         Reports: added a Progress by Department report for viewing class criteria progress
 
     Bug Fixes
 
 v27.0.01
 --------
 
     Bug Fixes
         Admissions: fixed submission emails and acceptance emails not sending as expected 
         Admissions: fixed required field logic checking in Form Builder
         Admissions: fixed "Do not include a second parent" being accidentally checked by default
         Admissions: fixed username and password missing from re-sent Acceptance Email
         Attendance: fixed handling of Count Class as School setting in Students Not Onsite/Students Not Present reports
         Messenger: fixed error redirect for New Message sending users to a non-existing page
 

diff --git a/i18n b/i18n
diff --git a/modules/Admissions/applications_manage_editProcess.php b/modules/Admissions/applications_manage_editProcess.php
@@ -89,7  89,7 @@
         // Setup which processes are going to run, based on user-selected checkboxes
         foreach ($processes as $processName => $process) {
             $formBuilder->addConfig(['mode' => 'process', $processName.'Enabled' => $process['enabled'] ?? 'N']);
-            $formData->setResults($process['data'] ?? []);
             $formData->addResults($process['data'] ?? []);
         }
 
         // Run any edit-related processes