diff options
author | Javan Makhmali <javan@javan.us> | 2016-07-13 15:07:49 -0400 |
---|---|---|
committer | Javan Makhmali <javan@javan.us> | 2016-07-13 15:07:49 -0400 |
commit | 03efd177a1465f3be28d4da653f41839359eda49 (patch) | |
tree | c914adc03a6172bd2c2f3bd5dea5a272b9b4f962 /actionpack/lib | |
parent | 451437c6f57e66cc7586ec966e530493927098c7 (diff) | |
download | rails-03efd177a1465f3be28d4da653f41839359eda49.tar.gz rails-03efd177a1465f3be28d4da653f41839359eda49.tar.bz2 rails-03efd177a1465f3be28d4da653f41839359eda49.zip |
Fix adding implicitly rendered namespaced template digests to ETags
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/metal/etag_with_template_digest.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/etag_with_template_digest.rb b/actionpack/lib/action_controller/metal/etag_with_template_digest.rb index 75ac996793..e3a7c3b166 100644 --- a/actionpack/lib/action_controller/metal/etag_with_template_digest.rb +++ b/actionpack/lib/action_controller/metal/etag_with_template_digest.rb @@ -45,7 +45,7 @@ module ActionController # template digest from the ETag. def pick_template_for_etag(options) unless options[:template] == false - options[:template] || "#{controller_name}/#{action_name}" + options[:template] || "#{controller_path}/#{action_name}" end end |