Merge pull request #1786 from weseek/fix/can-not-upload-image-to-comment

Can't upload image to comment

src/client/js/components/PageComment/CommentEditor.jsx

@@ -247,7 +247,7 @@ class CommentEditor extends React.Component {
                     isGfmMode={this.state.isMarkdown}
                     lineNumbers={false}
                     isMobile={appContainer.isMobile}
-                    isUploadable={this.state.isUploadable && this.state.isLayoutTypeGrowi} // enable only when GROWI layout
+                    isUploadable={this.state.isUploadable && layoutType === 'growi'} // enable only when GROWI layout
                     isUploadableFile={this.state.isUploadableFile}
                     emojiStrategy={emojiStrategy}
                     onChange={this.updateState}

src/client/js/services/CommentContainer.js

@@ -137,6 +137,7 @@ export default class CommentContainer extends Container {
 
     const endpoint = '/attachments.add';
     const formData = new FormData();
+    formData.append('_csrf', this.appContainer.csrfToken);
     formData.append('file', file);
     formData.append('path', pagePath);
     formData.append('page_id', pageId);