From cecf1f67cc701fb437730036e1cc79db056bacfe Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Thu, 28 Feb 2013 09:56:10 -0800
Subject: [PATCH] fix #620

---
 app/models/post.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index 0f2d85158..37bfe8984 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -730,11 +730,12 @@ class Post < ActiveRecord::Base
         return false
       end
       
-      delete!
+      ModAction.create(:description => "permanently deleted post ##{id}")
+      delete!(:without_mod_action => true)
       destroy
     end
     
-    def delete!
+    def delete!(options = {})
       if is_status_locked?
         self.errors.add(:is_status_locked, "; cannot delete post")
         return false
@@ -750,7 +751,10 @@ class Post < ActiveRecord::Base
         decrement_tag_post_counts
         update_column(:parent_id, nil)
         tag_array.each {|x| expire_cache(x)}
-        ModAction.create(:description => "deleted post ##{id}")
+        
+        unless options[:without_mod_action]
+          ModAction.create(:description => "deleted post ##{id}")
+        end
       end
     end