diff options
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/models/post.rb | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index af5de815bb..de14b59f8e 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -125,9 +125,9 @@ module AbstractController # ==== Returns # * <tt>self</tt> def process(action, *args) - @_action_name = action_name = action.to_s + @_action_name = action.to_s - unless action_name = method_for_action(action_name) + unless action_name = method_for_action(@_action_name) raise ActionNotFound, "The action '#{action}' could not be found for #{self.class.name}" end diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb index 6399a68d95..b1e56c14d1 100644 --- a/activerecord/test/models/post.rb +++ b/activerecord/test/models/post.rb @@ -167,10 +167,6 @@ class Post < ActiveRecord::Base return @log if message.nil? @log << [message, side, new_record] end - - def self.what_are_you - 'a post...' - end end class SpecialPost < Post; end |