From f9f75c6b4342c659b8bc0949db3734bbf64c1aaa Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 9 Apr 2018 15:59:51 -0400 Subject: [PATCH] fix accidental client-side invocation of post history controls if it was disabled via ACP --- public/src/client/topic/diffs.js | 8 ++++++++ public/src/client/topic/postTools.js | 10 ++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/public/src/client/topic/diffs.js b/public/src/client/topic/diffs.js index 3d57131624..be7b5b0731 100644 --- a/public/src/client/topic/diffs.js +++ b/public/src/client/topic/diffs.js @@ -4,6 +4,10 @@ define('forum/topic/diffs', ['forum/topic/images', 'benchpress', 'translator'], var Diffs = {}; Diffs.open = function (pid) { + if (!config.enablePostHistory) { + return; + } + var localeStringOpts = { year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric' }; socket.emit('posts.getDiffs', { pid: pid }, function (err, timestamps) { @@ -49,6 +53,10 @@ define('forum/topic/diffs', ['forum/topic/images', 'benchpress', 'translator'], }; Diffs.load = function (pid, since, postContainer) { + if (!config.enablePostHistory) { + return; + } + socket.emit('posts.showPostAt', { pid: pid, since: since }, function (err, data) { if (err) { return app.alertError(err.message); diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 5798386951..68ded070c9 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -140,10 +140,12 @@ define('forum/topic/postTools', [ } }); - postContainer.on('click', '[component="post/view-history"], [component="post/edit-indicator"]', function () { - var btn = $(this); - diffs.open(getData(btn, 'data-pid')); - }); + if (config.enablePostHistory) { + postContainer.on('click', '[component="post/view-history"], [component="post/edit-indicator"]', function () { + var btn = $(this); + diffs.open(getData(btn, 'data-pid')); + }); + } postContainer.on('click', '[component="post/delete"]', function () { var btn = $(this);