From da0239413f0366ac86341d40824685abc89f1e99 Mon Sep 17 00:00:00 2001 From: Philippe Durix Date: Thu, 20 Feb 2014 04:28:57 +0100 Subject: [PATCH] Fixed a regression introduced by commit #54c57330c419a597078170143398b33427114ae0 --- app/models/forem/topic.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/forem/topic.rb b/app/models/forem/topic.rb index 1336d732f..72ecda402 100644 --- a/app/models/forem/topic.rb +++ b/app/models/forem/topic.rb @@ -52,8 +52,9 @@ def by_most_recent_post end def by_pinned_or_most_recent_post - order('forem_topics.last_post_at DESC').order('forem_topics.pinned DESC') - #order('forem_topics.id') + order('forem_topics.pinned DESC'). + order('forem_topics.last_post_at DESC'). + order('forem_topics.id') end def pending_review