aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/railtie.rb
diff options
context:
space:
mode:
authorMarc-Andre Lafortune <github@marc-andre.ca>2011-03-16 09:43:14 -0400
committerSantiago Pastorino <santiago@wyeworks.com>2011-04-05 17:11:13 -0300
commit1c4db4d7c34a1062e998bbdee03e992c4c5bff6d (patch)
tree0cc36b6637483274b1a510df21c8e227bbd56ef6 /activesupport/lib/active_support/railtie.rb
parent18dde7bf4ffffc93c9b32df65c168df29a898fbb (diff)
downloadrails-1c4db4d7c34a1062e998bbdee03e992c4c5bff6d.tar.gz
rails-1c4db4d7c34a1062e998bbdee03e992c4c5bff6d.tar.bz2
rails-1c4db4d7c34a1062e998bbdee03e992c4c5bff6d.zip
Raise on invalid timezone
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'activesupport/lib/active_support/railtie.rb')
-rw-r--r--activesupport/lib/active_support/railtie.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb
index c2deba3b1b..910e9640d1 100644
--- a/activesupport/lib/active_support/railtie.rb
+++ b/activesupport/lib/active_support/railtie.rb
@@ -46,7 +46,7 @@ module ActiveSupport
# If assigned value cannot be matched to a TimeZone, an exception will be raised.
initializer "active_support.initialize_time_zone" do |app|
require 'active_support/core_ext/time/zones'
- zone_default = Time.__send__(:get_zone, app.config.time_zone)
+ zone_default = Time.__send__(:get_zone, app.config.time_zone) rescue nil
unless zone_default
raise \