Merge conflict for file upload token

CCI-MIT · Dec 10, 2019 · 25467f9 · 25467f9
2 parents db2ba0d + c6ede51
commit 25467f9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/view/src/main/resources/static/js/lib/newckeditorplugins/config.js b/view/src/main/resources/static/js/lib/newckeditorplugins/config.js
@@ -4,7 +4,7 @@ CKEDITOR.editorConfig = function( config ) {
 
     config.extraPlugins = 'justify,colorbutton,uploadimage,copyformatting,font,indentblock';
     config.uploadUrl = '/image/uploadCkEditor';
-    config.filebrowserImageUploadUrl = '/image/uploadCkEditor?' + _csrf.parameterName + '=' + _csrf.token ;
+    config.filebrowserImageUploadUrl = '/image/uploadCkEditor?' + window._csrf.parameterName + "=" +window._csrf.token ;
     config.toolbar = 'custom';
     config.toolbar_custom = [
         { name: 'clipboard', groups: [ 'clipboard', 'undo' ], items: [ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ,'-','CopyFormatting'] },