Changeset 113

Show
Ignore:
Timestamp:
06/13/08 23:00:25 (5 months ago)
Author:
jweiss
Message:

convert TimeZone? to Rails 2.1 syntax

Location:
trunk
Files:
3 removed
3 modified

Legend:

Unmodified
Added
Removed
  • trunk/CHANGELOG.txt

    r109 r113  
    11 
    22SVN 
     3 
     4* Update to Rails 2.1 
    35 
    46* Add /projects/1/stages/1/deployments/latest. Provided by Mathias Meyer 
  • trunk/app/controllers/application.rb

    r86 r113  
    2020  def set_timezone 
    2121    # default timezone is UTC (Edinburgh) 
    22     TzTime.zone = logged_in? ? ( current_user.tz rescue TimeZone['Edinburgh']): TimeZone['Edinburgh'] 
     22    Time.zone = logged_in? ? ( current_user.tz rescue TimeZone['Edinburgh']): TimeZone['Edinburgh'] 
    2323    yield 
    24     TzTime.reset! 
    25     TzTime.zone = TimeZone['Edinburgh'] 
     24    Time.zone = TimeZone['Edinburgh'] 
    2625  end 
    2726   
  • trunk/config/environment.rb

    r93 r113  
    5959 
    6060  # Make Active Record use UTC-base instead of local time 
    61   config.active_record.default_timezone = :utc 
     61  config.time_zone = 'UTC' 
    6262end 
    6363 
     
    100100# set default time_zone to UTC 
    101101ENV['TZ'] = 'UTC' 
    102 TzTime.zone = TimeZone['Edinburgh'] 
     102Time.zone = TimeZone['Edinburgh']