From 845937592f72f8e80cdc59a2bf3070685e14ad06 Mon Sep 17 00:00:00 2001 From: yanxd Date: Fri, 20 Dec 2013 11:03:57 +0800 Subject: [PATCH] =?UTF-8?q?4=E3=80=81=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E7=9A=84=20=E5=8A=A8=E6=80=81=E4=B8=AD=E8=A6=81?= =?UTF-8?q?=E5=8C=85=E6=8B=AC=E7=95=99=E8=A8=80=E7=9A=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 4dfb67c0c..ea8109dd0 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -410,8 +410,8 @@ class UsersController < ApplicationController @message = messages[@info_pages.offset, @info_pages.per_page] @state = 2 else - where_condition = nil;#"act_type <> 'JournalsForMessage'" - where_condition = "act_type <> 'JournalsForMessage'" + where_condition = nil; + # where_condition = "act_type <> 'JournalsForMessage'" if @user == User.current watcher = User.watched_by(@user) watcher.push(User.current)