Merge branch '6.x'

laravel · Feb 19, 2020 · 27b3c45 · 27b3c45
2 parents f13a1df + 641a7cd
commit 27b3c45
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Illuminate/Notifications/Messages/SimpleMessage.php b/src/Illuminate/Notifications/Messages/SimpleMessage.php
@@ -239,6 +239,7 @@ public function toArray()
             'outroLines' => $this->outroLines,
             'actionText' => $this->actionText,
             'actionUrl' => $this->actionUrl,
+            'displayableActionUrl' => str_replace(['mailto:', 'tel:'], '', $this->actionUrl),
         ];
     }
 }
diff --git a/src/Illuminate/Notifications/resources/views/email.blade.php b/src/Illuminate/Notifications/resources/views/email.blade.php
@@ -52,10 +52,11 @@
 @slot('subcopy')
 @lang(
     "If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\n".
-    'into your web browser: [:actionURL](:actionURL)',
+    'into your web browser: [:displayableActionUrl](:actionURL)',
     [
         'actionText' => $actionText,
         'actionURL' => $actionUrl,
+        'displayableActionUrl' => $displayableActionUrl,
     ]
 )
 @endslot