Merge branch 'master' into feature/changeoverviewtableforteachers

learnweb · Jun 11, 2024 · 7b97179 · 7b97179
2 parents e8717cf + 05ff0e2
commit 7b97179
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/step/email/lib.php b/step/email/lib.php
@@ -119,17 +119,18 @@ public function post_processing_bulk_operation() {
                     ['instanceid' => $step->id,
                         'touser' => $user->id, ]);
 
-                    $parsedsettings = $this->replace_placeholders($settings, $user, $step->id, $mailentries);
-
-                    $subject = $parsedsettings['subject'];
-                    $content = $parsedsettings['content'];
-                    $contenthtml = $parsedsettings['contenthtml'];
-                    // Software enhancement: use course info to parse content template!
-                    email_to_user($user, \core_user::get_noreply_user(), $subject, $content, $contenthtml);
-                    $DB->delete_records('lifecyclestep_email',
-                    ['instanceid' => $step->id,
-                        'touser' => $user->id, ]);
-                    $transaction->allow_commit();
+                $parsedsettings = $this->replace_placeholders($settings, $user, $step->id, $mailentries);
+                $subject = $parsedsettings['subject'];
+                $content = $parsedsettings['content'];
+                $contenthtml = $parsedsettings['contenthtml'];
+                // Software enhancement: use course info to parse content template!
+                $success = email_to_user($user, \core_user::get_noreply_user(), $subject, $content, $contenthtml);
+                if (!$success) {
+                    mtrace("E-mail to user {$user->id} failed.");
+                }
+                $DB->delete_records('lifecyclestep_email',
+                    ['instanceid' => $step->id, 'touser' => $user->id, ]);
+                $transaction->allow_commit();
             }
         }