From d16b54a1ea01d1dcbf6c876adcd9ad13ec9e482e Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Mon, 25 Aug 2014 09:15:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=B7=B3=E8=BD=AC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=81=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E5=90=8E?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E4=B8=8D=E8=83=BD=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/welcome_controller.rb | 6 +++---
 app/models/changeset.rb               | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 4e7cf0ce9..0d9206738 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -151,7 +151,7 @@ class WelcomeController < ApplicationController
   def entry_select
     #@first_page = FirstPage.where("page_type = 'project'").first
     url = request.original_url.gsub('/','')
-    if url.include?(Setting.host_course)
+    if url.include?(Setting.host_course.gsub('/',''))
       if @first_page.show_course == 1
         course
         render :course
@@ -160,7 +160,7 @@ class WelcomeController < ApplicationController
       end
 
       return 0
-    elsif url.include?(Setting.host_contest)
+    elsif url.include?(Setting.host_contest.gsub('/',''))
       if @first_page.show_contest == 1
         contest
         render :contest
@@ -169,7 +169,7 @@ class WelcomeController < ApplicationController
       end
 
       return 0
-    elsif url.include?(Setting.host_user)
+    elsif url.include?(Setting.host_user.gsub('/',''))
       redirect_to(:controller => "users", :action => "index")
     end
       
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index f2228e699..123de1bf3 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -307,8 +307,11 @@ class Changeset < ActiveRecord::Base
       UserScore.project(:push_code, self.user,self, { changeset_id: self.id })
       #更新用户等级
       UserLevels.update_user_level(self.user)
-      update_changeset(self.user,1)
-      update_changeset(self.user,2,self.repository.project)
+      unless self.user.nil?
+        update_changeset(self.user,1)
+        update_changeset(self.user,2,self.repository.project)
+      end
+
   end
 
   #积分刷新