From f4688f74db4e3f5cd5f860ecbb12120f823af6eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 7 Dec 2016 23:05:14 +0100
Subject: [PATCH] FIX: emoticons stop summary from being updated

---
 app/models/category.rb |  4 ++--
 lib/post_revisor.rb    | 18 +++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/models/category.rb b/app/models/category.rb
index 2a044088c88..e2dd126701e 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -213,11 +213,11 @@ SQL
   end
 
   def description_text
-    return nil unless description
+    return nil unless self.description
 
     @@cache ||= LruRedux::ThreadSafeCache.new(1000)
     @@cache.getset(self.description) do
-      Nokogiri::HTML(self.description).text
+      Nokogiri::HTML.fragment(self.description).text.strip
     end
   end
 
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 55d061ef91d..a5451affba9 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -442,18 +442,14 @@ class PostRevisor
   def update_category_description
     return unless category = Category.find_by(topic_id: @topic.id)
 
-    body = @post.cooked
-    matches = body.scan(/\<p\>(.*)\<\/p\>/)
+    doc = Nokogiri::HTML.fragment(@post.cooked)
+    doc.css("img").remove
 
-    matches.each do |match|
-      next if match[0] =~ /\<img(.*)src=/ || match[0].blank?
-      new_description = match[0]
-      # first 50 characters should be fine to test they haven't changed the default description
-      new_description = nil if new_description.starts_with?(I18n.t("category.replace_paragraph")[0..50])
-      category.update_column(:description, new_description)
-      @category_changed = category
-      break
-    end
+    html = doc.css("p").first.inner_html.strip
+    new_description = html unless html.starts_with?(Category.post_template[0..50])
+
+    category.update_column(:description, new_description)
+    @category_changed = category
   end
 
   def advance_draft_sequence