libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2993 from ether/fixes-2945

Browse source 
fixes #2945
This commit is contained in:
Stefan 2016-12-20 22:08:05 +01:00 committed by GitHub
commit efb25f417a
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/node/db/API.js
View file

@ -28,6 +28,7 @@ var authorManager = require("./AuthorManager");
var sessionManager = require("./SessionManager");
var async = require("async");
var exportHtml = require("../utils/ExportHtml");
var exportTxt = require("../utils/ExportTxt");
var importHtml = require("../utils/ImportHtml");
var cleanText = require("./Pad").cleanText;
var PadDiff = require("../utils/padDiff");
@ -271,7 +272,8 @@ exports.getText = function(padID, rev, callback)
//the client wants the latest text, lets return it to him
else
{
callback(null, {"text": pad.text()});
var padText = exportTxt.getTXTFromAtext(pad, pad.atext);
callback(null, {"text": padText});
}
});
}