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

[rails.git] / app / controllers / export_controller.rb

diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb
index 1b7beaad696dd8ca3503babaa26e67748a70e511..18ac15c101b47feeb1b518eb12a26a4b1dfe52e9 100644 (file)
--- a/app/controllers/export_controller.rb
+++ b/app/controllers/export_controller.rb
@@ -2,6 +2,7 @@ class ExportController < ApplicationController
   before_action :authorize_web
   before_action :set_locale
   before_action :update_totp, :only => [:finish]
   before_action :authorize_web
   before_action :set_locale
   before_action :update_totp, :only => [:finish]

+  authorize_resource :class => false

 
   caches_page :embed
 
 
   caches_page :embed
 


@@ -19,7 +20,7 @@ class ExportController < ApplicationController
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 
       format = params[:mapnik_format]
       scale = params[:mapnik_scale]
 

-      redirect_to "http://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"
+      redirect_to "https://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}"

     end
   end
 
     end
   end