Rails::Initializer#initialize_time_zone raises an error if value assigned to config.time_zone is not recognized. Rake time zone tasks only require ActiveSupport instead of entire environment

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9104 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 7 insertions, 1 deletions

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 4a536e0483..9909e6e45e 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -349,9 +349,15 @@ module Rails
       end
     end
 
+    # Sets the default value for Time.zone, and turns on ActiveRecord time_zone_aware_attributes.
+    # If assigned value cannot be matched to a TimeZone, an exception will be raised.
     def initialize_time_zone
       if configuration.time_zone
-        Time.zone_default = TimeZone[configuration.time_zone]
+        zone_default = TimeZone[configuration.time_zone]
+        unless zone_default
+          raise "Value assigned to config.time_zone not recognized. Run `rake -D time` for a list of tasks for finding appropriate time zone names."
+        end
+        Time.zone_default = zone_default
         if configuration.frameworks.include?(:active_record)
           ActiveRecord::Base.time_zone_aware_attributes = true
           ActiveRecord::Base.default_timezone = :utc