Merge branch 'master' into vdom

2016-02-12 22:06:41 +11:00 · 2016-02-12 22:06:41 +11:00 · 560e910c6c
parent f02e035f94 f77dfda097
commit 560e910c6c
2 changed files with 2 additions and 2 deletions
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@ -134,7 +134,7 @@

            {{#if model.details.suggested_topics.length}}
              <div id="suggested-topics">
-                <h3>{{{unbound view.suggestedTitle}}}</h3>
+                <h3>{{{view.suggestedTitle}}}</h3>
                <div class="topics">
                  {{#if model.isPrivateMessage}}
                  {{basic-topic-list
--- a/app/assets/javascripts/discourse/views/topic.js.es6
+++ b/app/assets/javascripts/discourse/views/topic.js.es6
@ -169,7 +169,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli
    return this.get('controller.model.isPrivateMessage') ?
      "<i class='private-message-glyph fa fa-envelope'></i> " + I18n.t("suggested_topics.pm_title") :
      I18n.t("suggested_topics.title");
-  }.property()
+  }.property('topic')
 });

 function highlight(postNumber) {