]> source.dussan.org Git - redmine.git/commitdiff
Removed #utf8nize! that is no longer used with Rails 3.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Thu, 26 Apr 2012 20:11:10 +0000 (20:11 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Thu, 26 Apr 2012 20:11:10 +0000 (20:11 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9536 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/application_controller.rb

index 17a0b9e1c5966ec129d6d369c24ac939b3529789..f560bae86f5655c8b496028af72f6b14c30b49f4 100644 (file)
@@ -46,30 +46,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  # FIXME: Remove this when all of Rack and Rails have learned how to
-  # properly use encodings
-  before_filter :params_filter
-
-  def params_filter
-    if RUBY_VERSION >= '1.9' && defined?(Rails) && Rails::VERSION::MAJOR < 3
-      self.utf8nize!(params)
-    end
-  end
-
-  def utf8nize!(obj)
-    if obj.frozen?
-      obj
-    elsif obj.is_a? String
-      obj.respond_to?(:force_encoding) ? obj.force_encoding("UTF-8") : obj
-    elsif obj.is_a? Hash
-      obj.each {|k, v| obj[k] = self.utf8nize!(v)}
-    elsif obj.is_a? Array
-      obj.each {|v| self.utf8nize!(v)}
-    else
-      obj
-    end
-  end
-
   before_filter :user_setup, :check_if_login_required, :set_localization
 
   rescue_from ActionController::InvalidAuthenticityToken, :with => :invalid_authenticity_token