Fix array merge exception on return from get_user_events_all

function was returning a database record causing exception on array_merge
catalyst · Nov 23, 2023 · 98aeb0e · 98aeb0e
1 parent 7a4959f
commit 98aeb0e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/classes/frequency.php b/classes/frequency.php
@@ -1219,7 +1219,10 @@ public function get_frequency_array(int $year, string $metric, array $modules) :
         } else {
             // Work through the event array.
             foreach ($modules as $module) {
-                $events = array_merge($events, $this->$functionname($module, $from, $to));
+                $records = $this->$functionname($module, $from, $to);
+                foreach ($records as $record) {
+                    $events[] = $record;
+                }
             }
         }
 

diff --git a/history.php b/history.php
@@ -49,7 +49,7 @@
     $actionurl = new moodle_url('/local/assessfreq/history.php', array('action' => 'confirmed'));
     $cancelurl = new moodle_url('/local/assessfreq/history.php');
     echo $OUTPUT->confirm(get_string('confirmreprocess', 'local_assessfreq'),
-        new single_button($actionurl, get_string('continue'), 'post', true),
+        new single_button($actionurl, get_string('continue'), 'post', single_button::BUTTON_SECONDARY),
         new single_button($cancelurl, get_string('cancel'), 'get'));
 
 } else if ($action == 'confirmed') {