Browse Source

replace CR/CRLF to LF when post revision

Yuki Takei 7 years ago
parent
commit
78c69df42c
1 changed files with 4 additions and 1 deletions
  1. 4 1
      lib/form/revision.js

+ 4 - 1
lib/form/revision.js

@@ -5,7 +5,10 @@ var form = require('express-form')
 
 
 module.exports = form(
 module.exports = form(
   field('pageForm.path').required(),
   field('pageForm.path').required(),
-  field('pageForm.body').required().custom(function(value) { return value.replace(/\r/g, '\n') }),
+  field('pageForm.body').required().custom(function(value) {
+    // see https://github.com/weseek/growi/issues/463
+    return value.replace(/\r\n?/g, '\n');
+  }),
   field('pageForm.currentRevision'),
   field('pageForm.currentRevision'),
   field('pageForm.grant').toInt().required(),
   field('pageForm.grant').toInt().required(),
   field('pageForm.grantUserGroupId'),
   field('pageForm.grantUserGroupId'),