comparison app/controllers/.svn/text-base/settings_controller.rb.svn-base @ 117:af80e5618e9b redmine-1.1

* Update to Redmine 1.1-stable branch (Redmine SVN rev 4707)
author Chris Cannam
date Thu, 13 Jan 2011 12:53:21 +0000
parents 94944d00e43c
children cbce1fd3b1b7
comparison
equal deleted inserted replaced
39:150ceac17a8d 117:af80e5618e9b
42 @options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] } 42 @options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] }
43 @deliveries = ActionMailer::Base.perform_deliveries 43 @deliveries = ActionMailer::Base.perform_deliveries
44 44
45 @guessed_host_and_path = request.host_with_port.dup 45 @guessed_host_and_path = request.host_with_port.dup
46 @guessed_host_and_path << ('/'+ Redmine::Utils.relative_url_root.gsub(%r{^\/}, '')) unless Redmine::Utils.relative_url_root.blank? 46 @guessed_host_and_path << ('/'+ Redmine::Utils.relative_url_root.gsub(%r{^\/}, '')) unless Redmine::Utils.relative_url_root.blank?
47
48 Redmine::Themes.rescan
47 end 49 end
48 50
49 def plugin 51 def plugin
50 @plugin = Redmine::Plugin.find(params[:id]) 52 @plugin = Redmine::Plugin.find(params[:id])
51 if request.post? 53 if request.post?