From b18d9f2eb32430779ad2da45471b1d7a17ce1ff5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 6 Jan 2017 17:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E5=BD=92=E6=A1=A3=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 4 ----
 app/controllers/users_controller.rb       | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c46c039ce..21653b3e4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -500,10 +500,6 @@ class ApplicationController < ActionController::Base
   #��ȡ�γ�
   def find_course
     @course= Course.find(params[:id])
-    if @course.is_delete == 1 and !User.current.admin?
-      render_404
-      return
-    end
   rescue ActiveRecord::RecordNotFound
     render_404
   end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4f723fb28..25d7dbf1d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -4193,7 +4193,7 @@ end
       end
       respond_to do |format|
         format.js
-        format.html {render :layout => 'new_base_user'}
+        format.html {render :layout => 'base_course_community'}
       end
     end
   end