diff --git a/app/Providers/MailServiceProvider.php b/app/Providers/MailServiceProvider.php index 0abea01a9dac..55f0b372908e 100644 --- a/app/Providers/MailServiceProvider.php +++ b/app/Providers/MailServiceProvider.php @@ -17,6 +17,7 @@ use Coconuts\Mail\PostmarkTransport; use GuzzleHttp\Client as HttpClient; use Illuminate\Mail\MailServiceProvider as MailProvider; use Illuminate\Mail\TransportManager; +use Illuminate\Container\Container; class MailServiceProvider extends MailProvider { @@ -33,11 +34,17 @@ class MailServiceProvider extends MailProvider protected function registerIlluminateMailer() { - //this is not octane safe + // //this is not octane safe $this->app->singleton('mail.manager', function($app) { return new GmailTransportManager($app); }); + + //this is octane ready - but is untested + // $this->app->bind('mail.manager', function ($app){ + // return new GmailTransportManager($app); + // }); + $this->app->bind('mailer', function ($app) { return $app->make('mail.manager')->mailer(); }); diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php index b6ae0d3c880c..2b510d8c5c08 100644 --- a/app/Utils/SystemHealth.php +++ b/app/Utils/SystemHealth.php @@ -164,6 +164,8 @@ class SystemHealth private static function extensions(): array { + $loaded_extensions = null; + $loaded_extensions = []; foreach (self::$extensions as $extension) { diff --git a/resources/views/portal/ninja2020/auth/login.blade.php b/resources/views/portal/ninja2020/auth/login.blade.php index 5fbc2a052730..44fdaf5d3975 100644 --- a/resources/views/portal/ninja2020/auth/login.blade.php +++ b/resources/views/portal/ninja2020/auth/login.blade.php @@ -26,7 +26,7 @@ @elseif(isset($company) && !is_null($company))