Merge remote-tracking branch 'origin/develop' into develop

app/services/discusses_service.rb

@@ -38,7 +38,7 @@ class DiscussesService
     #                                       group by d.dis_id order by cnt desc) a group by a.name
     #                                       order by cnt desc limit 9").map{|ht| ht.attributes.dup}
     tag_id = ShixunTagRepertoire.joins(:shixun).order("myshixuns_count desc").pluck(:tag_repertoire_id).uniq.first(9)
-    hot_tags = TagRepertoire.select([:id, :name]).where(:id => tag_id).order("FIELD(id, #{tag_id.join(",")})") if tag_id
+    hot_tags = TagRepertoire.select([:id, :name]).where(:id => tag_id).order("FIELD(id, #{tag_id.join(",")})").map{|ht| ht.attributes.dup} if tag_id
     memos = memo_list memos
     user_info = format_for_current_user current_user
     hot_memos = Memo.field_for_recommend.posts.hot.limit(4)