diff --git a/app/assets/javascripts/discourse/dialects/category_hashtag_dialect.js b/app/assets/javascripts/discourse/dialects/category_hashtag_dialect.js index f7a7f48d1e5..b0491091531 100644 --- a/app/assets/javascripts/discourse/dialects/category_hashtag_dialect.js +++ b/app/assets/javascripts/discourse/dialects/category_hashtag_dialect.js @@ -14,8 +14,8 @@ Discourse.Dialect.inlineRegexp({ categoryHashtagLookup = this.dialect.options.categoryHashtagLookup, result = categoryHashtagLookup && categoryHashtagLookup(slug); - if (result && result[0] === "category") { - return ['a', { class: attributeClass, href: result[1] }, '#', ["span", {}, slug]]; + if (result) { + return ['a', { class: attributeClass, href: result }, '#', ["span", {}, slug]]; } else { return ['span', { class: attributeClass }, hashtag]; } diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index a7b62a83d15..eb9f079d779 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -50,7 +50,7 @@ module PrettyText def category_hashtag_lookup(category_slug) if category = Category.query_from_hashtag_slug(category_slug) - ['category', category.url_with_id] + category.url_with_id else nil end