From e089f699c129472f1f11f52f1e84769afbe5d3a4 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 6 Jan 2015 06:16:22 +1100
Subject: [PATCH] upgrade pg to version 0.18, may fix encoding issue

---
 Gemfile                                                | 10 +---------
 Gemfile.lock                                           |  4 ++--
 .../javascripts/discourse/components/topic-list.js.es6 |  2 ++
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index b200869527e..551c79baa4c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -142,15 +142,7 @@ gem 'omniauth-github-discourse', require: 'omniauth-github'
 gem 'omniauth-oauth2', require: false
 gem 'omniauth-google-oauth2'
 gem 'oj'
-
-if rails_master?
-  # native casting
-  gem 'pg', '0.18.0.pre20141117110243'
-else
-  # while resolving https://groups.google.com/forum/#!topic/ruby-pg/5_ylGmog1S4
-  gem 'pg', '0.15.1'
-end
-
+gem 'pg'
 gem 'pry-rails', require: false
 gem 'rake'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 71954608e1d..f9a0ef20bda 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -279,7 +279,7 @@ GEM
     openid-redis-store (0.0.2)
       redis
       ruby-openid
-    pg (0.15.1)
+    pg (0.18.0)
     polyglot (0.3.5)
     progress (3.0.1)
     pry (0.10.1)
@@ -503,7 +503,7 @@ DEPENDENCIES
   omniauth-twitter
   onebox
   openid-redis-store
-  pg (= 0.15.1)
+  pg
   pry-nav
   pry-rails
   puma
diff --git a/app/assets/javascripts/discourse/components/topic-list.js.es6 b/app/assets/javascripts/discourse/components/topic-list.js.es6
index 17409d9c8c1..effcb2c8173 100644
--- a/app/assets/javascripts/discourse/components/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list.js.es6
@@ -6,6 +6,8 @@ export default Ember.Component.extend({
 
   _observeHideCategory: function(){
     this.addObserver('hideCategory', this.rerender);
+    this.addObserver('order', this.rerender);
+    this.addObserver('ascending', this.rerender);
   }.on('init'),
 
   toggleInTitle: function(){