diff --git a/htdocs/core/tpl/ajax/fileupload_main.tpl.php b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
index 1c6b988c368..01d27749e23 100644
--- a/htdocs/core/tpl/ajax/fileupload_main.tpl.php
+++ b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
@@ -44,6 +44,8 @@ $(function () {
// Options
$('#fileupload').fileupload('option', {
+ // Enable iframe cross-domain access via redirect option
+ reidrect: window.location.href.replace(/\/[^\/]*$/,'/includes/jquery/plugins/fileupload/cors/result.html?%s'),
maxFileSize: ''
});
diff --git a/htdocs/includes/jquery/plugins/fileupload/cors/result.html b/htdocs/includes/jquery/plugins/fileupload/cors/result.html
new file mode 100644
index 00000000000..7c98026846f
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/fileupload/cors/result.html
@@ -0,0 +1,20 @@
+
+
+
+
+
+jQuery Iframe Transport Plugin Redirect Page
+
+
+
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js b/htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
index a7b7d464ca5..e330fe16a36 100644
--- a/htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
+++ b/htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
@@ -1,5 +1,5 @@
/*
- * jQuery File Upload User Interface Plugin 6.9
+ * jQuery File Upload User Interface Plugin 6.9.1
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2010, Sebastian Tschan
@@ -530,8 +530,8 @@
},
_forceReflow: function (node) {
- this._reflow = $.support.transition &&
- node.length && node[0].offsetWidth;
+ return $.support.transition && node.length &&
+ node[0].offsetWidth;
},
_transition: function (node) {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6b187076b0a..d09ad632ba2 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -977,11 +977,13 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD))
{
print ''."\n";
- //print ''."\n";
+ print ''."\n";
print ''."\n";
print ''."\n";
print ''."\n";
print ''."\n";
+ print ''."\n";
+ ''."\n";
}
// jQuery DataTables
if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES))