From 2a1758636b68cadb98e83f8c709a4edd547596d6 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Fri, 8 Mar 2013 21:50:44 -0500
Subject: [PATCH] fix favorite tags

---
 app/views/users/edit.html.erb          | 2 +-
 config/initializers/z_action_mailer.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 0af874c8a..24104efbf 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -15,7 +15,7 @@
 
         <div class="input text optional field_with_hint">
           <label class="text optional" for="user_favorite_tags">Favorite tags</label>
-          <textarea id="user_favorite_tags" class="text optional" rows="5" name="user[favorite_tags]" cols="40">1 2 3 </textarea>
+          <textarea id="user_favorite_tags" class="text optional" rows="5" name="user[favorite_tags]" cols="40"><%= raw @user.favorite_tags %></textarea>
           <span class="hint">A list of whitespace delimited tags that show up in your profile. <%= link_to "Restore from old database", restore_uploaded_tags_user_path(@user), :method => :post, :remote => true %></span>
         </div>
         
diff --git a/config/initializers/z_action_mailer.rb b/config/initializers/z_action_mailer.rb
index e456a29bc..91ffabe9a 100644
--- a/config/initializers/z_action_mailer.rb
+++ b/config/initializers/z_action_mailer.rb
@@ -1,8 +1,8 @@
 if Danbooru.config.amazon_ses && Rails.env == "production"
   Danbooru::Application.config.action_mailer.smtp_settings = {
     :address => Danbooru.config.amazon_ses[:smtp_server_name],
-    :user_name => Danbooru.config.amazon_ses[:smtp_user_name],
-    :password => Danbooru.config.amazon_ses[:smtp_password],
+    :user_name => Danbooru.config.amazon_ses[:ses_smtp_user_name],
+    :password => Danbooru.config.amazon_ses[:ses_smtp_password],
     :authentication => :login,
     :enable_starttls_auto => true
   }