From: Tom Hughes <tom@compton.nu>
Date: Mon, 5 Jun 2017 21:32:55 +0000 (+0100)
Subject: Use explicit to_unsafe_h method when converting parameters to a hash
X-Git-Tag: live~3366
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/18c89465564807fcbf2a0ee89ca8a018a76ca838?hp=d85621c7aea365b1548d5301af292528dd8b329d;ds=sidebyside

Use explicit to_unsafe_h method when converting parameters to a hash
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 144904885..89636aaa8 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -74,7 +74,7 @@ class ApplicationController < ActionController::Base
     if request.cookies["_osm_session"].to_s == ""
       if params[:cookie_test].nil?
         session[:cookie_test] = true
-        redirect_to Hash[params].merge(:cookie_test => "true")
+        redirect_to params.to_unsafe_h.merge(:cookie_test => "true")
         false
       else
         flash.now[:warning] = t "application.require_cookies.cookies_needed"
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 6e26e798f..5ca5c0aab 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -50,7 +50,7 @@ class SiteController < ApplicationController
     new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
     new_params[:anchor] += "&layers=#{params[:layers]}" if params.key? :layers
 
-    redirect_to Hash[new_params]
+    redirect_to new_params.to_unsafe_h
   end
 
   def key
@@ -158,7 +158,7 @@ class SiteController < ApplicationController
     end
 
     if anchor.present?
-      redirect_to Hash[params].merge(:anchor => anchor.join("&"))
+      redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&"))
     end
   end
 end