diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index d6083d0f30..0e8d56c4b6 100644 --- 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}}
-

{{unbound view.suggestedTitle}}

+

{{{unbound view.suggestedTitle}}}

{{#if model.isPrivateMessage}} {{basic-topic-list diff --git a/app/assets/javascripts/discourse/views/topic.js.es6 b/app/assets/javascripts/discourse/views/topic.js.es6 index 89340de6ca..58939896bd 100644 --- a/app/assets/javascripts/discourse/views/topic.js.es6 +++ b/app/assets/javascripts/discourse/views/topic.js.es6 @@ -167,7 +167,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli suggestedTitle: function(){ return this.get('controller.model.isPrivateMessage') ? - I18n.t("suggested_topics.pm_title") : + " " + I18n.t("suggested_topics.pm_title") : I18n.t("suggested_topics.title"); }.property() }); diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb index b1f88e372d..980dfafa0f 100644 --- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb +++ b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb @@ -22,12 +22,12 @@ class PostgreSQLFallbackHandler Thread.new do begin - logger.info "#{self.class}: Checking master server..." + logger.warn "#{self.class}: Checking master server..." connection = ActiveRecord::Base.postgresql_connection(config) if connection.active? connection.disconnect! - logger.info "#{self.class}: Master server is active. Reconnecting..." + logger.warn "#{self.class}: Master server is active. Reconnecting..." ActiveRecord::Base.establish_connection(config) Discourse.disable_readonly_mode @master = true