Fix fragment cache helper regression on cache miss introduced with 03d01e #2224

Merged
merged 1 commit into from Oct 13, 2011

Conversation

Projects
None yet
2 participants
@kommen
Contributor

kommen commented Jul 23, 2011

Ported pull request #2219 to master as requested by @spastorino.

Fix fragment cache helper regression on cache miss introduced with 03d01ec.

Contains following patches cherry-picked from @lhahne's 3-0-stable branch:

  • Added tests for the output_buffer returned by CacheHelper (c476a6b)
    The output_buffer returned by CacheHelper should be html_safe if the original buffer is html_safe.
  • made sure that the possible new output_buffer created by CacheHelper is of the same type as the original (39a4f67)
Fix fragment cache helper regression on cache miss introduced with 03…
…d01ec.

Contains following patches cherry-picked from @lhahne's 3-0-stable branch:

* Added tests for the output_buffer returned by CacheHelper (c476a6b)
The output_buffer returned by CacheHelper should be html_safe if the original buffer is html_safe.

* made sure that the possible new output_buffer created by CacheHelper is of the same type as the original (39a4f67)

spastorino added a commit that referenced this pull request Oct 13, 2011

Merge pull request #2224 from kommen/fix_fragment_caching_for_master
Fix fragment cache helper regression on cache miss introduced with 03d01e

@spastorino spastorino merged commit df5ea6b into rails:master Oct 13, 2011

@kommen kommen deleted the kommen:fix_fragment_caching_for_master branch Jan 8, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment