From f4492a0d99f897e1d48a58696bbedf0c5c7a7ad1 Mon Sep 17 00:00:00 2001
From: Sal-N <saluki.nguyen@gmail.com>
Date: Mon, 15 Apr 2013 07:10:18 +0300
Subject: [PATCH 1/3] partial fix #1199

---
 app/views/users/edit.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index f6681dd33..0b6e1b8fe 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -29,7 +29,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"><%= raw @user.favorite_tags %></textarea>
-          <span class="hint">A list of whitespace delimited tags that show up in your profile.</span>
+          <span class="hint">Put the tags you often use here, so they can show up in Related Tags field when you upload or edit a post.</span>
         </div> 
       </fieldset>
       
@@ -57,4 +57,4 @@
   Settings - <%= Danbooru.config.app_name %>
 <% end %>
 
-<%= render "secondary_links" %>
\ No newline at end of file
+<%= render "secondary_links" %>

From 6e0cf4cdd59d8e0cae010f4d2005544685f6cbb8 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Mon, 15 Apr 2013 00:38:01 -0400
Subject: [PATCH 2/3] fix typo

---
 app/controllers/posts_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 6c111d3ec..369d7d45a 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -1,6 +1,6 @@
 class PostsController < ApplicationController
   before_filter :member_only, :except => [:show, :show_seq, :index]
-  before_fitler :janitor_only, :only => [:ban, :unban]
+  before_filter :janitor_only, :only => [:ban, :unban]
   after_filter :save_recent_tags, :only => [:update]
   respond_to :html, :xml, :json
   rescue_from PostSets::SearchError, :with => :rescue_exception

From 7aae5f03e8fb3010ec093a358719f1ad2e61a2de Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Mon, 15 Apr 2013 00:38:15 -0400
Subject: [PATCH 3/3] Revert "partial fix #1199"

This reverts commit f4492a0d99f897e1d48a58696bbedf0c5c7a7ad1.
---
 app/views/users/edit.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 0b6e1b8fe..f6681dd33 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -29,7 +29,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"><%= raw @user.favorite_tags %></textarea>
-          <span class="hint">Put the tags you often use here, so they can show up in Related Tags field when you upload or edit a post.</span>
+          <span class="hint">A list of whitespace delimited tags that show up in your profile.</span>
         </div> 
       </fieldset>
       
@@ -57,4 +57,4 @@
   Settings - <%= Danbooru.config.app_name %>
 <% end %>
 
-<%= render "secondary_links" %>
+<%= render "secondary_links" %>
\ No newline at end of file