summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuiza Pagliari <lpagliari@gmail.com>2018-02-16 14:18:51 -0200
committerGitHub <noreply@github.com>2018-02-16 14:18:51 -0200
commit187e51948d33d7715c7e59669267c1f53e17090b (patch)
treeb04571ba4ee1de32a4f3618dedd864f0c23bae55 /src
parent0c806b7fc0dad3c55f749e736aa8175bbb2a0e2b (diff)
downloadetherpad-lite-187e51948d33d7715c7e59669267c1f53e17090b.zip
[fix] Don't show "pad deleted" message when copying pad (#3320)
Fix #3183
Diffstat (limited to 'src')
-rw-r--r--src/node/db/Pad.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/node/db/Pad.js b/src/node/db/Pad.js
index d44cb7b3..0cb01cac 100644
--- a/src/node/db/Pad.js
+++ b/src/node/db/Pad.js
@@ -464,9 +464,10 @@ Pad.prototype.copy = function copy(destinationID, force, callback) {
}
else force = true;
- //kick everyone from this pad
- // TODO: this presents a message on the client saying that the pad was 'deleted'. Fix this?
- padMessageHandler.kickSessionsFromPad(sourceID);
+ // Kick everyone from this pad.
+ // This was commented due to https://github.com/ether/etherpad-lite/issues/3183.
+ // Do we really need to kick everyone out?
+ // padMessageHandler.kickSessionsFromPad(sourceID);
// flush the source pad:
_this.saveToDatabase();