diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-12-14 15:36:59 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-12-14 15:36:59 +0000 |
| commit | e2952d3e5fc44c997c15ca3e5a1c0229ee1019c0 (patch) | |
| tree | 983c8bec504fc4df4f301f5ffdba2ca51cc8ce4b /app | |
| parent | 040d0a32d2be94736a5419d608dfec2bb37b2bc8 (diff) | |
| download | redmine-e2952d3e5fc44c997c15ca3e5a1c0229ee1019c0.tar.gz redmine-e2952d3e5fc44c997c15ca3e5a1c0229ee1019c0.zip | |
Rails 2.1.2 deprecations (#2332).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2134 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | app/views/my/account.rhtml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index ff46d9772..96923900e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -144,7 +144,7 @@ class User < ActiveRecord::Base end def time_zone - @time_zone ||= (self.pref.time_zone.blank? ? nil : TimeZone[self.pref.time_zone]) + @time_zone ||= (self.pref.time_zone.blank? ? nil : ActiveSupport::TimeZone[self.pref.time_zone]) end def wants_comments_in_reverse_order? diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml index 20210c99a..f4b726f96 100644 --- a/app/views/my/account.rhtml +++ b/app/views/my/account.rhtml @@ -38,7 +38,7 @@ <div class="box tabular"> <% fields_for :pref, @user.pref, :builder => TabularFormBuilder, :lang => current_language do |pref_fields| %> <p><%= pref_fields.check_box :hide_mail %></p> -<p><%= pref_fields.select :time_zone, TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p> +<p><%= pref_fields.select :time_zone, ActiveSupport::TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p> <p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p> <% end %> </div> |