From 39f100a4022c26f72c75094506fadf06e9fd4914 Mon Sep 17 00:00:00 2001 From: Dario Milicic Date: Thu, 23 Oct 2014 11:38:14 +0200 Subject: [PATCH] All absolute URLs that were used for uploading files are now relative. --- scripts/ckeditor/plugins/fileupload/dialogs/fileupload.js | 2 +- scripts/ckeditor/plugins/image2/dialogs/image2.js | 2 +- scripts/load-ckeditor.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ckeditor/plugins/fileupload/dialogs/fileupload.js b/scripts/ckeditor/plugins/fileupload/dialogs/fileupload.js index 7ff1782d..c9efcfea 100644 --- a/scripts/ckeditor/plugins/fileupload/dialogs/fileupload.js +++ b/scripts/ckeditor/plugins/fileupload/dialogs/fileupload.js @@ -73,7 +73,7 @@ CKEDITOR.dialog.add( 'fileuploadDialog', function( editor ) { } formData.append('cmd', "Upload"); // Command for server to recognize this as an file upload - var URL = '/' + parent.logbook + '/upload.html?next_attachment=' + parent.next_attachment; + var URL = 'upload.html?next_attachment=' + parent.next_attachment; $.ajax({ xhr: function() diff --git a/scripts/ckeditor/plugins/image2/dialogs/image2.js b/scripts/ckeditor/plugins/image2/dialogs/image2.js index eae8ee97..3c36a001 100755 --- a/scripts/ckeditor/plugins/image2/dialogs/image2.js +++ b/scripts/ckeditor/plugins/image2/dialogs/image2.js @@ -572,7 +572,7 @@ CKEDITOR.dialog.add( 'image2', function( editor ) { } formData.append('cmd', "Upload"); // Command for server to recognize this as an file upload - var URL = '/' + parent.logbook + '/upload.html?next_attachment=' + parent.next_attachment; + var URL = 'upload.html?next_attachment=' + parent.next_attachment; $.ajax({ xhr: function() diff --git a/scripts/load-ckeditor.js b/scripts/load-ckeditor.js index 1a83e2a1..4a78a42f 100755 --- a/scripts/load-ckeditor.js +++ b/scripts/load-ckeditor.js @@ -144,7 +144,7 @@ $(document).ready(function() { formData.append('cmd', "Upload"); // Command for server to recognize this as an file upload if (tests.formdata) { - var URL = '/' + parent.logbook + '/upload.html?next_attachment=' + parent.next_attachment; + var URL = 'upload.html?next_attachment=' + parent.next_attachment; // set the flag so the chkupload validator doesn't trigger uploading_dropped_files = true;