From 422e07fa484d60aeb293b4a5bfd399e30c8f405b Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 19 Sep 2015 09:50:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=96=E5=AD=90=E5=B1=95=E7=A4=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/forums_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index 112550918..a0b66480c 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -141,7 +141,7 @@ class ForumsController < ApplicationController
     @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
     @memos = @forum.topics.
                     # reorder("#{Memo.table_name}.sticky DESC").
-                    includes(:last_reply).where("last_replies_memos.parent_id is null and  #{Memo.table_name}.parent_id is null").
+                    includes(:last_reply).
                     limit(@topic_pages.per_page).
                     offset(@topic_pages.offset).
                     reorder(order).