From a4567396e457519ec9727f8e19799558349b18d3 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 20 Mar 2015 11:08:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=9B=BE=E7=89=87=E5=B0=B1=E4=BC=9A=E6=8A=A5=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/discuss_demos_controller.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/discuss_demos_controller.rb b/app/controllers/discuss_demos_controller.rb
index a0955efe2..b0c9791cb 100644
--- a/app/controllers/discuss_demos_controller.rb
+++ b/app/controllers/discuss_demos_controller.rb
@@ -26,10 +26,12 @@ class DiscussDemosController < ApplicationController
 
   def destroy
     asset = Kindeditor::Asset.find_by_owner_id(params[:id])
-    filepath = File.join(Rails.root,"public","files","uploads",
-                         asset[:created_at].to_s.gsub("+0800","").to_datetime.strftime("%Y%m").to_s,
-                         asset[:asset].to_s)
-    File.delete(filepath) if File.exist?filepath
+    if !asset.nil?
+      filepath = File.join(Rails.root,"public","files","uploads",
+                           asset[:created_at].to_s.gsub("+0800","").to_datetime.strftime("%Y%m").to_s,
+                           asset[:asset].to_s)
+      File.delete(filepath) if File.exist?filepath
+    end
     DiscussDemo.destroy(params[:id])
     redirect_to :controller=> 'discuss_demos',:action => 'index'
   end