Merge branch '34698-fix-stubbing-cached-markdown-fields' into 'master'

Fix stubbing attributes alongside cache_markdown_field Closes #34698 See merge request !12661

Merge branch '34698-fix-stubbing-cached-markdown-fields' into 'master'
7f381461 · Rémy Coutable · 050eae8c · 6d63d766 · 7f381461
Commit 7f381461 authored Jul 06, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cache_markdown_field.rb app/models/concerns/cache_markdown_field.rb +1 -1

No files found.
--- a/app/models/concerns/cache_markdown_field.rb
+++ b/app/models/concerns/cache_markdown_field.rb
@@ -78,7 +78,7 @@ module CacheMarkdownField
  def cached_html_up_to_date?(markdown_field)
    html_field = cached_markdown_fields.html_field(markdown_field)

-    cached = !cached_html_for(markdown_field).nil? && !__send__(markdown_field).nil?
+    cached = cached_html_for(markdown_field).present? && __send__(markdown_field).present?
    return false unless cached

    markdown_changed = attribute_changed?(markdown_field) || false