Merged r2270, r2344, r2359, r2360, r2362, r2363, r2415, r2423, r2424 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2425 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-09 18:46:00 +00:00
parent fae04f3ae1
commit bc4249e3d3
15 changed files with 24 additions and 20 deletions
@@ -40,7 +40,7 @@ class SettingsController < ApplicationController
    @options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] }
    @deliveries = ActionMailer::Base.perform_deliveries

-    @guessed_host_and_path = request.host_with_port
+    @guessed_host_and_path = request.host_with_port.dup
    @guessed_host_and_path << ('/'+ request.relative_url_root.gsub(%r{^\/}, '')) unless request.relative_url_root.blank?
  end