aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2007-01-05 20:46:34 +0000
committerRick Olson <technoweenie@gmail.com>2007-01-05 20:46:34 +0000
commitb51727aa496127810be66d665cf8c82a78a99b1a (patch)
tree3b7e63b8a1347ce003ae400f615df53d2792d373 /actionpack
parent6c914d983e6bae7044bed1116d425fd28dbb3ed3 (diff)
downloadrails-b51727aa496127810be66d665cf8c82a78a99b1a.tar.gz
rails-b51727aa496127810be66d665cf8c82a78a99b1a.tar.bz2
rails-b51727aa496127810be66d665cf8c82a78a99b1a.zip
Slight doc tweak to #prepend_filter. Closes #6493 [Jeremy Voorhis]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5862 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/filters.rb4
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index ddd6050480..7aefb52963 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Slight doc tweak to #prepend_filter. Closes #6493 [Jeremy Voorhis]
+
* Add more extensive documentation to the AssetTagHelper. Closes #6452 [Bob Silva]
* Clean up multiple calls to #stringify_keys in TagHelper, add better documentation and testing for TagHelper. Closes #6394 [Bob Silva]
diff --git a/actionpack/lib/action_controller/filters.rb b/actionpack/lib/action_controller/filters.rb
index 9f3d1e58d9..3290defff8 100644
--- a/actionpack/lib/action_controller/filters.rb
+++ b/actionpack/lib/action_controller/filters.rb
@@ -81,10 +81,10 @@ module ActionController #:nodoc:
# can use <tt>prepend_before_filter</tt> and <tt>prepend_after_filter</tt>. Filters added by these methods will be put at the
# beginning of their respective chain and executed before the rest. For example:
#
- # class ShoppingController
+ # class ShoppingController < ActionController::Base
# before_filter :verify_open_shop
#
- # class CheckoutController
+ # class CheckoutController < ShoppingController
# prepend_before_filter :ensure_items_in_cart, :ensure_items_in_stock
#
# The filter chain for the CheckoutController is now <tt>:ensure_items_in_cart, :ensure_items_in_stock,</tt>