Merge pull request #3013 from evazion/fix-undelete-modaction

Log correct post id when approving deleted posts.

app/models/post_approval.rb

@@ -28,7 +28,7 @@ class PostApproval < ActiveRecord::Base
   end
 
   def approve_post
-    ModAction.log("undeleted post ##{id}") if post.is_deleted
+    ModAction.log("undeleted post ##{post_id}") if post.is_deleted
 
     post.flags.each(&:resolve!)
     post.update({ approver: user, is_flagged: false, is_pending: false, is_deleted: false }, without_protection: true)

test/unit/post_test.rb

@@ -349,9 +349,8 @@ class PostTest < ActiveSupport::TestCase
         end
 
         should "create a mod action" do
-          assert_difference("ModAction.count", 1) do
+          @post.undelete!
-            @post.undelete!
+          assert_equal("undeleted post ##{@post.id}", ModAction.last.description)
-          end
         end
       end
 
@@ -362,9 +361,8 @@ class PostTest < ActiveSupport::TestCase
         end
 
         should "create a mod action" do
-          assert_difference("ModAction.count", 1) do
+          @post.approve!
-            @post.approve!
+          assert_equal("undeleted post ##{@post.id}", ModAction.last.description)
-          end
         end
       end