Merge branch 'release/3.4.2' into v3.0

TeenQuotes · Apr 6, 2015 · 0a32b34 · 0a32b34
2 parents bd8be6b + f8091fc
commit 0a32b34
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 4 deletions.
diff --git a/app/TeenQuotes/Newsletters/Console/UnsubscribeUsersCommand.php b/app/TeenQuotes/Newsletters/Console/UnsubscribeUsersCommand.php
@@ -94,7 +94,6 @@ public function fire()
 		$this->newslettersManager->deleteForUsers($allUsers);
 
 		// Send an email to each user to notice them
-		new MailSwitcher('smtp');
 		$nonActiveUsers->each(function($user)
 		{
 			// Log this info

diff --git a/ressources/views/emails/default.blade.php b/ressources/views/emails/default.blade.php
@@ -1,3 +1,3 @@
-@include('layouts.email.header')
+@include('emails.layout.html.header')
 	@yield('content')
-@include('layouts.email.footer')
+@include('emails.layout.html.footer')
diff --git a/...rces/views/layouts/email/footer.blade.php → ...views/emails/layout/html/footer.blade.php b/...rces/views/layouts/email/footer.blade.php → ...views/emails/layout/html/footer.blade.php
diff --git a/...rces/views/layouts/email/header.blade.php → ...views/emails/layout/html/header.blade.php b/...rces/views/layouts/email/header.blade.php → ...views/emails/layout/html/header.blade.php
@@ -2,7 +2,7 @@
 <html lang="en-US">
 <head>
 	<meta charset="utf-8">
-	@include('layouts.email.style')
+	@include('emails.layout.html.style')
 </head>
 <body>
 	<div id="background">

diff --git a/...urces/views/layouts/email/style.blade.php → .../views/emails/layout/html/style.blade.php b/...urces/views/layouts/email/style.blade.php → .../views/emails/layout/html/style.blade.php
diff --git a/ressources/views/emails/layout/text/footer.blade.php b/ressources/views/emails/layout/text/footer.blade.php
diff --git a/ressources/views/emails/layout/text/header.blade.php b/ressources/views/emails/layout/text/header.blade.php
diff --git a/ressources/views/emails/text.blade.php b/ressources/views/emails/text.blade.php
@@ -0,0 +1,3 @@
+@include('emails.layout.text.header')
+	@yield('content')
+@include('emails.layout.text.footer')