diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 21f1c52f77f5..53f49f4f854c 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -78,7 +78,6 @@ class AppServiceProvider extends ServiceProvider
->middleware('client');
});
-
/* Ensure we don't have stale state in jobs */
Queue::before(function (JobProcessing $event) {
App::forgetInstance('truthsource');
@@ -107,7 +106,6 @@ class AppServiceProvider extends ServiceProvider
return $this;
});
-
Mailer::macro('mailgun_config', function (string $secret, string $domain, string $endpoint = 'api.mailgun.net') {
// @phpstan-ignore /** @phpstan-ignore-next-line **/
Mailer::setSymfonyTransport(app('mail.manager')->createSymfonyTransport([
diff --git a/app/Services/Email/EmailDefaults.php b/app/Services/Email/EmailDefaults.php
index 6598bac40d9f..8eb8765ca69b 100644
--- a/app/Services/Email/EmailDefaults.php
+++ b/app/Services/Email/EmailDefaults.php
@@ -177,7 +177,7 @@ class EmailDefaults
$breaks = ["
","
","
"];
$this->email->email_object->text_body = str_ireplace($breaks, "\r\n", $this->email->email_object->body);
$this->email->email_object->text_body = strip_tags($this->email->email_object->text_body);
- $this->email->email_object->text_body = str_replace('$view_button', '$view_url', $this->email->email_object->text_body);
+ $this->email->email_object->text_body = str_replace(['$view_button','$viewButton'], '$view_url', $this->email->email_object->text_body);
if ($this->template == 'email.template.custom') {
$this->email->email_object->body = (str_replace('$body', $this->email->email_object->body, str_replace(["\r","\n"], "", $this->email->email_object->settings->email_style_custom)));