From ff6373badc45f0b7c1964010a15af602564bd7e0 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Mon, 9 Jun 2014 15:07:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_watchlist.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/user_watchlist.html.erb b/app/views/users/user_watchlist.html.erb
index f20b80eef..bc4a655d8 100644
--- a/app/views/users/user_watchlist.html.erb
+++ b/app/views/users/user_watchlist.html.erb
@@ -13,7 +13,7 @@
       <tr>  <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
         <td colspan="2" width="580px" ><p class="font_description">
 			<% unless user.memberships.empty? %>
-			<% cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" %>
+			<% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
 			<% memberships = user.memberships.all(:conditions => cond) %>
 			<%= l(:label_x_contribute_to, :count => memberships.count) %>
 			<% for member in memberships %>
@@ -23,7 +23,7 @@
 			</p>
 			<p class="font_description">
 			<% unless user.memberships.empty? %>
-			<% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %>
+			<% cond = Project.visible_condition(User.current) + " AND projects.project_type = 1" %>
 			<% memberships = user.memberships.all(:conditions => cond) %>
 			<%= l(:label_x_course_contribute_to, :count => memberships.count) %>
 			<% for member in memberships %>