aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-06-02 18:43:08 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-06-02 18:43:08 -0500
commit4b4aa8f6e08ba2aa2ddce56f1d5b631a78eeef6c (patch)
tree02267f3696ec55ac2c371784944dc40eb93ee8a2 /railties
parenta855ab89b7aae7cb451611301a1e83495f647f8a (diff)
downloadrails-4b4aa8f6e08ba2aa2ddce56f1d5b631a78eeef6c.tar.gz
rails-4b4aa8f6e08ba2aa2ddce56f1d5b631a78eeef6c.tar.bz2
rails-4b4aa8f6e08ba2aa2ddce56f1d5b631a78eeef6c.zip
AR can be disabled, new_rails_defaults.rb should check [#303 state:resolved] (Jesper Hvirring Henriksen)
Diffstat (limited to 'railties')
-rw-r--r--railties/configs/initializers/new_rails_defaults.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/railties/configs/initializers/new_rails_defaults.rb b/railties/configs/initializers/new_rails_defaults.rb
index 5e60c0ade4..78e0117cc4 100644
--- a/railties/configs/initializers/new_rails_defaults.rb
+++ b/railties/configs/initializers/new_rails_defaults.rb
@@ -1,11 +1,13 @@
# These settings change the behavior of Rails 2 apps and will be defaults
# for Rails 3. You can remove this initializer when Rails 3 is released.
-# Include Active Record class name as root for JSON serialized output.
-ActiveRecord::Base.include_root_in_json = true
+if defined?(ActiveRecord)
+ # Include Active Record class name as root for JSON serialized output.
+ ActiveRecord::Base.include_root_in_json = true
-# Store the full class name (including module namespace) in STI type column.
-ActiveRecord::Base.store_full_sti_class = true
+ # Store the full class name (including module namespace) in STI type column.
+ ActiveRecord::Base.store_full_sti_class = true
+end
# Use ISO 8601 format for JSON serialized times and dates.
ActiveSupport.use_standard_json_time_format = true