Fix duplicate caching of some templates #1021
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The change above makes sure that the `default_content_type` option is always deleted from the options. This in turn makes sure that identical template is cached only once, regardless of whether the explicit `content_type` option is specified or not. Not to mention it also makes sure that the `default_content_type` option is not passed as an engine option to the engine which might complain about it.
| @@ -805,7 +805,8 @@ def render(engine, data, options = {}, locals = {}, &block) | |||
| layout = engine_options[:layout] if layout.nil? or (layout == true && engine_options[:layout] != false) | |||
| layout = @default_layout if layout.nil? or layout == true | |||
| layout_options = options.delete(:layout_options) || {} | |||
| content_type = options.delete(:content_type) || options.delete(:default_content_type) | |||
| content_type = options.delete(:default_content_type) | |||
| content_type = options.delete(:content_type) || content_type | |||
| layout_engine = options.delete(:layout_engine) || engine | |||
| scope = options.delete(:scope) || self | |||
| options.delete(:layout) | |||
There was a problem hiding this comment.
How about just calling options.delete(:default_content_type) here (L811) instead?
There was a problem hiding this comment.
I think the fix is fine as it is, as the relevant lines are all together, but whatever rocks your boat. It's zzak's call in the end after all.
|
Needs a test |
|
@zzak: I can come up with one, sure. But it won't be anytime soon, if you don't mind. I expect couple of weeks more before I can get back to it... |
|
@raxoft No rush, if you'd like to work on it let me know! |
zzak
pushed a commit
that referenced
this pull request
May 9, 2016
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The change above makes sure that the
default_content_typeoption is always deleted from the options.This in turn makes sure that identical template is cached only once, regardless of whether the explicit
content_typeoption is specified or not.Not to mention it also makes sure that the
default_content_typeoption is not passed as an engine option to the engine which might complain about it.