Merge pull request #711 from duncanbarnes/master

Added ability to configure email sender name

diff --git a/.env.example b/.env.example
index 54badeb7c05f6eb6007c13131c9ff100340466af..ccafaf4fb2c53b0a00ed858a957ca225a5565d38 100644 (file)
--- a/.env.example
+++ b/.env.example
@@ -75,3 +75,5 @@ MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_FROM=null
+MAIL_FROM_NAME=null

diff --git a/config/mail.php b/config/mail.php
index 0386e0198414569006ad9b2228486f718a62cad9..689be99b8f2385ba19b60b2c489bf917f0601ce1 100644 (file)
--- a/config/mail.php
+++ b/config/mail.php
@@ -54,7 +54,7 @@ return [
     |
     */
 
-    'from' => ['address' => env('MAIL_FROM', '[email protected]'), 'name' => 'BookStack'],
+    'from' => ['address' => env('MAIL_FROM', '[email protected]'), 'name' => env('MAIL_FROM_NAME','BookStack')],
 
     /*
     |--------------------------------------------------------------------------