aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Masover <dave@3mix.com>2008-09-30 12:07:21 -0500
committerJoshua Peek <josh@joshpeek.com>2008-09-30 12:07:21 -0500
commite69b506abd40222c87be28398c5191db160740cb (patch)
tree159e66cb5db81ab1c60eb63de5d3fa1f5dcc3b65
parent0eefa7058a47772978aef550f7d85235a5529874 (diff)
downloadrails-e69b506abd40222c87be28398c5191db160740cb.tar.gz
rails-e69b506abd40222c87be28398c5191db160740cb.tar.bz2
rails-e69b506abd40222c87be28398c5191db160740cb.zip
Call controller_path instance method so it can be easily overridden [#1141 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
-rw-r--r--actionpack/lib/action_controller/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 0e8d3efca4..976bd98bfa 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -1250,7 +1250,7 @@ module ActionController #:nodoc:
action_name = strip_out_controller(action_name)
end
end
- "#{self.class.controller_path}/#{action_name}"
+ "#{self.controller_path}/#{action_name}"
end
def strip_out_controller(path)
@@ -1258,7 +1258,7 @@ module ActionController #:nodoc:
end
def template_path_includes_controller?(path)
- self.class.controller_path.split('/')[-1] == path.split('/')[0]
+ self.controller_path.split('/')[-1] == path.split('/')[0]
end
def process_cleanup