From 22a5d6a6b01bb85ac3aef7138fe00044184330ba Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 20 Oct 2014 17:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E8=AF=BE=E7=A8=8BID?=
 =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6=E5=8A=A0=E5=85=A5=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E6=8C=89=E9=92=AE=E6=8A=A5404=E8=80=8C=E4=B8=8D?=
 =?UTF-8?q?=E4=BC=9A=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index b4be3deb7..6507b3178 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -21,7 +21,7 @@ class CoursesController < ApplicationController
   before_filter :toggleCourse, only: [:finishcourse, :restartcourse]
 
   before_filter :require_login, :only => [:join, :unjoin]
-  before_filter :allow_join, :only => [:join]
+  #before_filter :allow_join, :only => [:join]
 
   def join
     if User.current.logged?
@@ -29,7 +29,7 @@ class CoursesController < ApplicationController
       if course
         @state = 4
       else
-        unless User.current.member_of_course? course
+        unless (allow_join && User.current.member_of_course?(course))
           if params[:course_password] == course.password
             members = []
             members << Member.new(:role_ids => [10], :user_id => User.current.id)