Do not use @:skip_relative_url_root@ to generate urls in Mailer (#2122).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1992 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-11-08 13:25:45 +00:00
parent 81eee10d5b
commit 077723c90a
2 changed files with 54 additions and 2 deletions
@@ -183,9 +183,13 @@ class Mailer < ActionMailer::Base
    super
    set_language_if_valid Setting.default_language
    from Setting.mail_from
-    default_url_options[:host] = Setting.host_name
+    
+    # URL options
+    h = Setting.host_name
+    h = h.to_s.gsub(%r{\/.*$}, '') unless ActionController::AbstractRequest.relative_url_root.blank?
+    default_url_options[:host] = h
    default_url_options[:protocol] = Setting.protocol
-    default_url_options[:skip_relative_url_root] = true
+    
    # Common headers
    headers 'X-Mailer' => 'Redmine',
            'X-Redmine-Host' => Setting.host_name,