Merge pull request #5183 from opf/fix/24622/protocol-url-default

[24622] Use protocol in default url_for options
8 years ago · 44303b8e89
parent 36aebac777 10f83c8bb7
commit 44303b8e89
1 changed files with 4 additions and 1 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -122,7 +122,10 @@ class ApplicationController < ActionController::Base
  helper Redmine::MenuManager::MenuHelper

  def default_url_options(_options = {})
-    { layout: params['layout'] }
+    {
+      layout: params['layout'],
+      protocol: Setting.protocol
+    }
  end

  # set http headers so that the browser does not store any