fix ApplicationController#check_session to return bool, fix #xhtml to use tidy_bytes in RSS

1 files changed, 6 insertions, 2 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index dfab86e..e72362d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -67,15 +67,19 @@ class ApplicationController < ActionController::Base
   end
 
   def check_session
-    if (session[:user_id] || session[:account]) and not (session[:user_id] && session[:account])
+    if !!session[:user_id] == !!session[:account]
+      true
+    else
       reset_session
+      false
     end
   end
 
   def xhtml
     if request.format == :html
       response.content_type = "application/xhtml+xml"
-
+    end
+    if request.format == :html || request.format == :rss
       # remove invalid charactors
       u = ActiveSupport::Multibyte::Unicode
       response.body = u.tidy_bytes(response.body)