Corrected @@configurations typo. #1410 [david@ruppconsulting.com]

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

2 files changed, 5 insertions, 3 deletions

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 454ab93cfa..84d46062df 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Corrected @@configurations typo #1410 [david@ruppconsulting.com]
+
 * Return PostgreSQL columns in the order they were declared #1374 [perlguy@gmail.com]
 
 * Allow before/after update hooks to work on models using optimistic locking 
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 0a953cfcd0..9782b6cd04 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -249,10 +249,10 @@ module ActiveRecord #:nodoc:
     end
 
     @@subclasses = {}
-    
+
     cattr_accessor :configurations
-    @@primary_key_prefix_type = {}
-    
+    @@configurations = {}
+
     # Accessor for the prefix type that will be prepended to every primary key column name. The options are :table_name and 
     # :table_name_with_underscore. If the first is specified, the Product class will look for "productid" instead of "id" as
     # the primary column. If the latter is specified, the Product class will look for "product_id" instead of "id". Remember