code cleanup r10542 changes (#10937)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10544 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
a29854707b
commit
ef988ba17c
|
@ -40,7 +40,7 @@ class SettingsController < ApplicationController
|
||||||
else
|
else
|
||||||
@options = {}
|
@options = {}
|
||||||
user_format = User::USER_FORMATS.collect{|key, value| [key, value[:setting_order]]}.sort{|a, b| a[1] <=> b[1]}
|
user_format = User::USER_FORMATS.collect{|key, value| [key, value[:setting_order]]}.sort{|a, b| a[1] <=> b[1]}
|
||||||
@options[:user_format] = user_format.collect{|v| v[0]}.collect{|f| [User.current.name(f), f.to_s]}
|
@options[:user_format] = user_format.collect{|f| [User.current.name(f[0]), f[0].to_s]}
|
||||||
@deliveries = ActionMailer::Base.perform_deliveries
|
@deliveries = ActionMailer::Base.perform_deliveries
|
||||||
|
|
||||||
@guessed_host_and_path = request.host_with_port.dup
|
@guessed_host_and_path = request.host_with_port.dup
|
||||||
|
|
Loading…
Reference in New Issue