Merge branch 'master' of github.com:sharelatex/web-sharelatex

This commit is contained in:
Henry Oswald 2014-04-10 17:26:14 +01:00
commit f7ea925e67

View file

@ -94,15 +94,12 @@ module.exports =
logger.log project_id:project_id, file_id:file_id, dumpPath:dumpPath, "tpds update write stream finished"
callback null, dumpPath
stream.resume()
readFileIntoTextArray = (path, callback)->
fs.readFile path, "utf8", (error, content = "") ->
if error?
logger.err path:path, "error reading file into text array"
return callback(err)
lines = content.split("\n")
lines = content.split(/\r\n|\n|\r/)
callback error, lines