Merge pull request #711 from duncanbarnes/master

ssddanbrown · web-flow · commit c44c42103c9e · 2018-03-10T17:45:16.000Z
Added ability to configure email sender name
diff --git 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
@@ -54,7 +54,7 @@
     |
     */
 
-    'from' => ['address' => env('MAIL_FROM', 'mail@bookstackapp.com'), 'name' => 'BookStack'],
+    'from' => ['address' => env('MAIL_FROM', 'mail@bookstackapp.com'), 'name' => env('MAIL_FROM_NAME','BookStack')],
 
     /*
     |--------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`\|`
`55`	`55`	`*/`
`56`	`56`
`57`		`- 'from' => ['address' => env('MAIL_FROM', 'mail@bookstackapp.com'), 'name' => 'BookStack'],`
	`57`	`+ 'from' => ['address' => env('MAIL_FROM', 'mail@bookstackapp.com'), 'name' => env('MAIL_FROM_NAME','BookStack')],`
`58`	`58`
`59`	`59`	`/*`
`60`	`60`	`\|--------------------------------------------------------------------------`