From 2119774fb651b59c2d61054dc22dd53c551622de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 16 Aug 2013 09:58:20 +0200
Subject: [PATCH] FIX: custom avatars in email

---
 app/models/user.rb           | 2 +-
 lib/jobs/generate_avatars.rb | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 6fdae105e50..b014563c42f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -308,7 +308,7 @@ class User < ActiveRecord::Base
   #   - emails
   def small_avatar_url
     template = avatar_template
-    template.gsub("{size}", "60")
+    template.gsub("{size}", "45")
   end
 
   def avatar_template
diff --git a/lib/jobs/generate_avatars.rb b/lib/jobs/generate_avatars.rb
index 9a22220eee7..abc4960a07f 100644
--- a/lib/jobs/generate_avatars.rb
+++ b/lib/jobs/generate_avatars.rb
@@ -21,8 +21,10 @@ module Jobs
           # create a temp file with the same extension as the original
           temp_file = Tempfile.new(["discourse-avatar", File.extname(original_path)])
           temp_path = temp_file.path
-          #
-          Discourse.store.store_avatar(temp_file, upload, size) if ImageSorcery.new(original_path).convert(temp_path, gravity: "center", thumbnail: "#{size}x#{size}^", extent: "#{size}x#{size}", background: "transparent")
+          # create a centered square thumbnail
+          if ImageSorcery.new(original_path).convert(temp_path, gravity: "center", thumbnail: "#{size}x#{size}^", extent: "#{size}x#{size}", background: "transparent")
+            Discourse.store.store_avatar(temp_file, upload, size)
+          end
           # close && remove temp file
           temp_file.close!
         end