Merge pull request #1737 from ether/develop

Patch allow spam to be sent :|
This commit is contained in:
John McLear 2013-04-15 06:38:42 -07:00
commit c5a58d392c
2 changed files with 0 additions and 8 deletions

View file

@ -8,7 +8,6 @@
* Fix: Import browser detection
* Fix: 2 Part Locale Specs
* Fix: Remove language string from chat element
* Fix: Temporary patch for Changeset Spam
* Fix: Make Saved revision Star fade back out on non Top frames
* Other: Remove some cruft legacy JS from old Etherpad
* Other: Express 3.1.2 breaks sessions, set Express to 3.1.0

View file

@ -1663,16 +1663,9 @@ exports.appendATextToAssembler = function (atext, assem) {
* @param cs {Changeset}
* @param pool {AtributePool}
*/
var lastEvent = null; // This is just a temporary measure to ensure we don't send the exact same changeset twice
// Documentation for this is available at https://github.com/ether/etherpad-lite/issues/1652
exports.prepareForWire = function (cs, pool) {
if(cs == lastEvent){
throw new Error("Not sending the same event twice...");
}
var newPool = new AttributePool();
var newCs = exports.moveOpsToNewPool(cs, pool, newPool);
lastEvent = cs;
return {
translated: newCs,
pool: newPool