From da59c15b72c5b34679e77b6cfc0882e6c6a2e771 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 19 Feb 2013 14:06:31 -0500
Subject: [PATCH] Remove leftover sub-tag support.

---
 app/assets/javascripts/discourse/models/topic.js.coffee    | 7 -------
 .../javascripts/discourse/templates/topic.js.handlebars    | 2 +-
 .../discourse/templates/topic_extra_info.js.handlebars     | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/topic.js.coffee b/app/assets/javascripts/discourse/models/topic.js.coffee
index dd95bd26b..8ee310c4c 100644
--- a/app/assets/javascripts/discourse/models/topic.js.coffee
+++ b/app/assets/javascripts/discourse/models/topic.js.coffee
@@ -69,13 +69,6 @@ Discourse.Topic = Discourse.Model.extend Discourse.Presence,
 
   ).property('new_posts', 'id')
 
-  displayTitle: (->
-    return null unless @get('title')
-    return @get('title') unless @get('category')
-    matches = @get('title').match(/^([a-zA-Z0-9]+\: )?(.*)/)
-    return matches[2]
-  ).property('title')
-
   # The coldmap class for the age of the topic
   ageCold: (->
     return unless lastPost = @get('last_posted_at')
diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars
index df9ff9868..add9aec92 100644
--- a/app/assets/javascripts/discourse/templates/topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars
@@ -17,7 +17,7 @@
             <h1>
               {{#if view.topic.title}}
                 {{view Discourse.TopicStatusView topicBinding="view.topic"}}
-                <a href='{{unbound view.topic.url}}'>{{unbound view.topic.displayTitle}}</a>
+                <a href='{{unbound view.topic.url}}'>{{unbound view.topic.title}}</a>
               {{else}}
                 {{#if view.topic.missing}}
                   {{i18n topic.not_found.title}}
diff --git a/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars b/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars
index 6697e2320..148223e6a 100644
--- a/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars
@@ -5,7 +5,7 @@
 <h1>
 {{#if view.topic.title}}
   {{view Discourse.TopicStatusView topicBinding="view.topic"}}
-  <a class='topic-link' href='{{unbound view.topic.url}}'>{{view Discourse.AutoSizedTextView tagName="span" class="auto-sizer" contentBinding="view.topic.displayTitle"}}</a>
+  <a class='topic-link' href='{{unbound view.topic.url}}'>{{view Discourse.AutoSizedTextView tagName="span" class="auto-sizer" contentBinding="view.topic.title"}}</a>
 {{else}}
   {{#if view.topic.missing}}
     {{i18n topic.not_found.title}}