From 3ffd3a5d3c6df879f7a3f0088bd179544cbf43ac Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 21 Apr 2015 16:26:24 -0400
Subject: [PATCH] closes #2970, closes #3078

---
 public/src/client/topic/events.js | 11 +++--------
 src/privileges/posts.js           |  2 +-
 src/threadTools.js                |  3 +--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js
index 80df64dc6d..d40fc776a1 100644
--- a/public/src/client/topic/events.js
+++ b/public/src/client/topic/events.js
@@ -1,7 +1,7 @@
 
 'use strict';
 
-/* globals config, app, ajaxify, define, socket, templates */
+/* globals config, app, ajaxify, define, socket, templates, translator, utils */
 
 define('forum/topic/events', [
 	'forum/topic/browsing',
@@ -20,8 +20,8 @@ define('forum/topic/events', [
 		'event:voted': updatePostVotesAndUserReputation,
 		'event:favourited': updateFavouriteCount,
 
-		'event:topic_deleted': toggleTopicDeleteState,
-		'event:topic_restored': toggleTopicDeleteState,
+		'event:topic_deleted': threadTools.setDeleteState,
+		'event:topic_restored': threadTools.setDeleteState,
 		'event:topic_purged': onTopicPurged,
 
 		'event:topic_locked': threadTools.setLockedState,
@@ -81,11 +81,6 @@ define('forum/topic/events', [
 		$('[data-pid="' + data.post.pid + '"] .favouriteCount').html(data.post.reputation).attr('data-favourites', data.post.reputation);
 	}
 
-	function toggleTopicDeleteState(data) {
-		threadTools.setLockedState(data);
-		threadTools.setDeleteState(data);
-	}
-
 	function onTopicPurged(data) {
 		ajaxify.go('category/' + ajaxify.variables.get('category_id'));
 	}
diff --git a/src/privileges/posts.js b/src/privileges/posts.js
index 8dfd89bff2..f39de4e08e 100644
--- a/src/privileges/posts.js
+++ b/src/privileges/posts.js
@@ -109,7 +109,7 @@ module.exports = function(privileges) {
 				return callback(null, true);
 			}
 			if (results.isEditable.isLocked) {
-				return callback(new Error('[[error:topic-locked]]]'));
+				return callback(new Error('[[error:topic-locked]]'));
 			}
 			if (results.isEditable.isEditExpired) {
 				return callback(new Error('[[error:post-edit-duration-expired, ' + meta.config.postEditDuration + ']]'));
diff --git a/src/threadTools.js b/src/threadTools.js
index 1a8016a2e2..ea66ac9239 100644
--- a/src/threadTools.js
+++ b/src/threadTools.js
@@ -36,7 +36,7 @@ var async = require('async'),
 					return callback(err);
 				}
 				topicData.deleted = isDelete ? 1 : 0;
-				ThreadTools[isDelete ? 'lock' : 'unlock'](tid, uid);
+
 				if (isDelete) {
 					plugins.fireHook('action:topic.delete', tid);
 				} else {
@@ -47,7 +47,6 @@ var async = require('async'),
 					tid: tid,
 					cid: topicData.cid,
 					isDelete: isDelete,
-					isLocked: isDelete,
 					uid: uid
 				};