wait #6269 @1

diff --git a/.docker/config/cron/crontab b/.docker/config/cron/crontab
index 4acd6f4ad473d3e783477573a1559778f96b2345..5fc614e9975fb2308ca8825f90ee5b32186ad210 100644 (file)
--- a/.docker/config/cron/crontab
+++ b/.docker/config/cron/crontab
@@ -4,3 +4,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
 * * * * *   runuser -l toolbox -c '/usr/bin/php /application/artisan schedule:run' > /proc/1/fd/1 2>/proc/1/fd/2
 20 5 * * *  /application/scripts/restartworkers > /proc/1/fd/1 2>/proc/1/fd/2
+

diff --git a/app/Models/User.php b/app/Models/User.php
index 86b22c84ec7dd16a200225ad6a9dff6148fee614..7d666b47f9c03a8f7a2ac1b9d116c2d62a923903 100644 (file)
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -27,7 +27,11 @@ class User extends \Cubedesigners\UserDatabase\Models\User
 
     public function avatar()
     {
-        $res = Gravatar::get($this->email);
+        try {
+            $res = Gravatar::get($this->email);
+        } catch (\Exception $e) {
+            $res = Gravatar::get(md5($this->email) . '@cubedesigners.com');
+        }
         return str_replace('.jpg', '', $res);
     }
 }

diff --git a/app/Notifications/ToolboxNotification.php b/app/Notifications/ToolboxNotification.php
index ac9f520fe29e5d08e99a181c2be205535fd6a055..11f90ef1de60665c84ff3c16378b7a3b265ce26c 100644 (file)
--- a/app/Notifications/ToolboxNotification.php
+++ b/app/Notifications/ToolboxNotification.php
@@ -65,7 +65,7 @@ class ToolboxNotification extends Notification
         foreach ($this->actions as $label => $url) {
             $m->line(new HtmlString($label . __(': ') . ' <a href="' . $url . '">' . $url . '</a>'));
         }
-        $m->salutation(new HtmlString(__('Cordialement,') . "<br>" . __('L\'équipe :teamname',['team_name'=>env('MAIL_TEAM_NAME')])));
+        $m->salutation(new HtmlString(__('Cordialement,') . "<br>" . __('L\'équipe :teamname', ['teamname' => env('MAIL_TEAM_NAME')])));
         return $m;
 
     }