From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 1 Oct 2012 07:19:11 +0000 (+0000)
Subject: code cleanup r10542 changes (#10937)
X-Git-Tag: 2.2.0~306
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ef988ba17cde0fef14d59be0df26bd068769b5ee;p=redmine.git

code cleanup r10542 changes (#10937)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10544 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index e3387e400..b27582671 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -40,7 +40,7 @@ class SettingsController < ApplicationController
     else
       @options = {}
       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
 
       @guessed_host_and_path = request.host_with_port.dup