diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-07-15 19:36:19 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-07-15 19:36:19 +0530 |
| commit | a80e1e437e74409d8b47b0c3b0cc0bc9ba78c190 (patch) | |
| tree | abcfc7fcc30c7196cb2b71c7217f91d5a344197b /activesupport | |
| parent | aa6f5120a71dd04f54f248b6c60890bca6d82adc (diff) | |
| parent | 92dcdc590ebb8407e7f53c26d501d169799d0eff (diff) | |
| download | rails-a80e1e437e74409d8b47b0c3b0cc0bc9ba78c190.tar.gz rails-a80e1e437e74409d8b47b0c3b0cc0bc9ba78c190.tar.bz2 rails-a80e1e437e74409d8b47b0c3b0cc0bc9ba78c190.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/zones.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/zones.rb b/activesupport/lib/active_support/core_ext/time/zones.rb index 5f2fec3782..37bc3fae24 100644 --- a/activesupport/lib/active_support/core_ext/time/zones.rb +++ b/activesupport/lib/active_support/core_ext/time/zones.rb @@ -26,11 +26,11 @@ class Time # around_filter :set_time_zone # # def set_time_zone - # old_time_zone = Time.zone - # Time.zone = current_user.time_zone if logged_in? - # yield - # ensure - # Time.zone = old_time_zone + # if logged_in? + # Time.use_zone(current_user.time_zone) { yield } + # else + # yield + # end # end # end def zone=(time_zone) |