aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/whiny_nil.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-07-10 19:41:59 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-07-10 19:41:59 +0000
commitf0c22d4ad5c61e7e683291fd42e143d1a339c3a2 (patch)
treeb6815bee5d0834955db78074e52bf07247d399a4 /activesupport/lib/active_support/whiny_nil.rb
parenta72ace1596c5be23cf6f3dee29232d8529053eb1 (diff)
downloadrails-f0c22d4ad5c61e7e683291fd42e143d1a339c3a2.tar.gz
rails-f0c22d4ad5c61e7e683291fd42e143d1a339c3a2.tar.bz2
rails-f0c22d4ad5c61e7e683291fd42e143d1a339c3a2.zip
occured -> occurred. Closes #5559.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4604 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/whiny_nil.rb')
-rw-r--r--activesupport/lib/active_support/whiny_nil.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/whiny_nil.rb b/activesupport/lib/active_support/whiny_nil.rb
index 61cbe98e2b..cee510afbd 100644
--- a/activesupport/lib/active_support/whiny_nil.rb
+++ b/activesupport/lib/active_support/whiny_nil.rb
@@ -30,7 +30,7 @@ class NilClass
def raise_nil_warning_for(klass = nil, selector = nil, with_caller = nil)
message = "You have a nil object when you didn't expect it!"
message << "\nYou might have expected an instance of #{klass}." if klass
- message << "\nThe error occured while evaluating nil.#{selector}" if selector
+ message << "\nThe error occurred while evaluating nil.#{selector}" if selector
raise NoMethodError, message, with_caller || caller
end