Merge remote-tracking branch 'upstream/pull/4843'

[rails.git] / config / initializers / router.rb

diff --git a/config/initializers/router.rb b/config/initializers/router.rb
index 0987fa0183fb5fd399237857e5e03a05ef54a3b4..849aba2ad15f428785b83f457b0141933dbdfd7a 100644 (file)
--- a/config/initializers/router.rb
+++ b/config/initializers/router.rb
@@ -1,14 +1,14 @@
 # Some versions of ruby seem to accidentally force the encoding
 # as part of normalize_path and some don't
 
-module OSM
+module OpenStreetMap
   module Router
     module ForceEncoding
       def normalize_path(path)
-        super(path).force_encoding("UTF-8")
+        super.force_encoding("UTF-8")
       end
     end
   end
 end
 
-ActionDispatch::Journey::Router::Utils.singleton_class.prepend(OSM::Router::ForceEncoding)
+ActionDispatch::Journey::Router::Utils.singleton_class.prepend(OpenStreetMap::Router::ForceEncoding)