Merge pull request #2754 from techAPJ/patch-1

hide category name for Uncategorized topics while oneboxing

lib/onebox/engine/discourse_local_onebox.rb

@@ -57,9 +57,10 @@ module Onebox
               }
             end
 
+            category_name = ''
             category = topic.category
-            if category
-              category = "<a href=\"#{category.url}\" class=\"badge badge-category\" style=\"background-color: ##{category.color}; color: ##{category.text_color}\">#{category.name}</a>"
+            if category && !category.uncategorized?
+              category_name = "<a href=\"#{category.url}\" class=\"badge badge-category\" style=\"background-color: ##{category.color}; color: ##{category.text_color}\">#{category.name}</a>"
             end
 
             quote = post.excerpt(SiteSetting.post_onebox_maxlength)
@@ -71,7 +72,7 @@ module Onebox
                         views: topic.views,
                         posters: posters,
                         quote: quote,
-                        category: category,
+                        category_name: category_name,
                         topic: topic.id
 
             @template = 'topic'

lib/onebox/templates/discourse_topic_onebox.handlebars

@@ -2,7 +2,7 @@
   <div class='title'>
     <div class='quote-controls'></div>
     {{{avatar}}}
-    <a href="{{original_url}}">{{title}}</a> {{{category}}}
+    <a href="{{original_url}}">{{title}}</a> {{{category_name}}}
   </div>
   <blockquote>{{{quote}}}
     <div class='topic-info'>