From 2d9876a6ac7bc8b4cc7b86b9a0d66d4b46515cfc Mon Sep 17 00:00:00 2001
From: Harry Seo <harry@kakao.com>
Date: Wed, 4 Dec 2013 20:49:54 +0900
Subject: [PATCH] FIX: set_locale filter must be executed before check_xhr
 filter because check_xhr filter renders html in some cases

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3de9fa4af6e..10eda59b3f8 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -25,6 +25,7 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  before_filter :set_locale
   before_filter :set_mobile_view
   before_filter :inject_preview_style
   before_filter :disable_customization
@@ -33,7 +34,6 @@ class ApplicationController < ActionController::Base
   before_filter :store_incoming_links
   before_filter :preload_json
   before_filter :check_xhr
-  before_filter :set_locale
   before_filter :redirect_to_login_if_required
 
   rescue_from Exception do |exception|