Skip to content

Commit

Permalink
fixed a bug with config for laravel 5
Browse files Browse the repository at this point in the history
  • Loading branch information
ammont committed Aug 13, 2015
1 parent 2bb077c commit ed57862
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions src/Citco/Mailer/MailerServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ public function register()
$mailer->alwaysFrom($from['address'], $from['name']);
}

$mailer->x_site_id = config('mailer.site.id');
$mailer->sender_addr = array(config('mailer.noreply.address'), config('mailer.noreply.name'));
$mailer->log_addr = array(config('mailer.log.address'), config('mailer.log.name'));
$mailer->developer_addr = array(config('mailer.dev.address'), config('mailer.dev.name'));
$mailer->return_path = config('mailer.return.path');
$mailer->x_site_id = config('mailer.site_id');
$mailer->sender_addr = array(config('mailer.noreply_address'), config('mailer.noreply_name'));
$mailer->log_addr = array(config('mailer.log_address'), config('mailer.log_name'));
$mailer->developer_addr = array(config('mailer.dev_address'), config('mailer.dev_name'));
$mailer->return_path = config('mailer.return_path');

// Here we will determine if the mailer should be in "pretend" mode for this
// environment, which will simply write out e-mail to the logs instead of
Expand Down
16 changes: 8 additions & 8 deletions src/config/mailer.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
return array(

// This variable is used to set X-Site-ID
'site.id' => 'site',
'site_id' => 'site',

// All outgoing emails should be sent from this address
'noreply.address' => 'noreply@example.com',
'noreply.name' => 'no-reply',
'noreply_address' => 'noreply@example.com',
'noreply_name' => 'no-reply',

// A copy of all emails should be sent to this address
'log.address' => null,
'log.name' => null,
'log_address' => null,
'log_name' => null,

// All emails in local and dev environment should be sent to this address
'dev.address' => 'developer@example.com',
'dev.name' => 'Devel',
'dev_address' => 'developer@example.com',
'dev_name' => 'Devel',

'return.path' => '',
'return_path' => '',

);

0 comments on commit ed57862

Please sign in to comment.