From b30a608f3591c6c80587b67714fea6d4040ee5af Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 10 Dec 2012 21:32:45 +0100
Subject: [PATCH] [feature/soft-delete] Remove the "Deleted by" message when
 restoring a post

PHPBB3-9567
---
 phpBB/styles/prosilver/template/ajax.js             | 9 +++++++++
 phpBB/styles/prosilver/template/viewtopic_body.html | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index 6c68549dd4..999fe29b49 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -26,9 +26,18 @@ phpbb.add_ajax_callback('post_delete', function() {
 // This callback removes the approve / disapprove div or link.
 phpbb.add_ajax_callback('post_visibility', function(res) {
 	var remove = (res.visible) ? $(this) : $(this).parents('.post');
+
 	$(remove).css('pointer-events', 'none').fadeOut(function() {
 		$(this).remove();
 	});
+
+	if (res.visible)
+	{
+		// Remove the "Deleted by" message from the post on restoring.
+		remove.parents('.post').find('.post_deleted_msg').css('pointer-events', 'none').fadeOut(function() {
+			$(this).remove();
+		});
+	}
 });
 
 // This removes the parent row of the link or form that fired the callback.
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 226b6fde5a..12c9d85d84 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -199,7 +199,7 @@
 
 			<!-- IF postrow.S_DISPLAY_NOTICE --><div class="rules">{L_DOWNLOAD_NOTICE}</div><!-- ENDIF -->
 			<!-- IF postrow.DELETED_MESSAGE or postrow.DELETE_REASON -->
-				<div class="notice">{postrow.DELETED_MESSAGE}
+				<div class="notice post_deleted_msg">{postrow.DELETED_MESSAGE}
 					<!-- IF postrow.DELETE_REASON --><br /><strong>{L_REASON}:</strong> <em>{postrow.DELETE_REASON}</em><!-- ENDIF -->
 				</div>
 			<!-- ELSEIF postrow.EDITED_MESSAGE or postrow.EDIT_REASON -->