diff options
| author | John McLear <john@mclear.co.uk> | 2013-04-28 13:11:34 -0700 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2013-04-28 13:11:34 -0700 |
| commit | 9f2bab2ba3f558016da717f24906a6cf664deaa7 (patch) | |
| tree | b246ee63879c522a5c1d21ae4548502f61d19895 | |
| parent | 702a30016460ba3ab72eb08d3dbc9ea7cbc45b38 (diff) | |
| parent | e7d8f124ad303c5d2ea9284b2d92f6246eab3d89 (diff) | |
| download | etherpad-lite-9f2bab2ba3f558016da717f24906a6cf664deaa7.zip | |
Merge pull request #1760 from bemeric1/develop
Issue #1652: Fix to client-side-induced changeset spamming.
| -rw-r--r-- | src/static/js/Changeset.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js index b1604212..f9270385 100644 --- a/src/static/js/Changeset.js +++ b/src/static/js/Changeset.js @@ -2105,7 +2105,9 @@ exports.follow = function (cs1, cs2, reverseInsertOrder, pool) { exports.copyOp(op2, opOut); op2.opcode = ''; } else if (!op2.opcode) { - exports.copyOp(op1, opOut); + // @NOTE: Critical bugfix for EPL issue #1625. We do not copy op1 here + // in order to prevent attributes from leaking into result changesets. + // exports.copyOp(op1, opOut); op1.opcode = ''; } else { // both keeps |