diff options
author | redmatrix <git@macgirvin.com> | 2016-07-26 22:51:07 -0700 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-07-26 22:51:07 -0700 |
commit | 672c3d7c6df2bf4667546c4376318d8684568014 (patch) | |
tree | 24d27705ad197ea1769f906404d6e14071f5599d /view | |
parent | 72479041ae51a5af020cb405715aa7fa3d6a97f1 (diff) | |
parent | e286b510f1488b0fd529258a0d6159111fc4a2ef (diff) | |
download | volse-hubzilla-672c3d7c6df2bf4667546c4376318d8684568014.tar.gz volse-hubzilla-672c3d7c6df2bf4667546c4376318d8684568014.tar.bz2 volse-hubzilla-672c3d7c6df2bf4667546c4376318d8684568014.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view')
-rw-r--r-- | view/js/mod_cloud.js | 2 | ||||
-rw-r--r-- | view/tpl/cloud_actionspanel.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js index 71e916446..0584cec53 100644 --- a/view/js/mod_cloud.js +++ b/view/js/mod_cloud.js @@ -93,6 +93,6 @@ function DragDropUploadFile(file, idx) { xhr.open('post', window.location.pathname, true); var data = new FormData(document.getElementById("ajax-upload-files")); - data.append('file', file); + data.append('file[]', file); xhr.send(data); } diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl index acba965f2..9cdd73b31 100644 --- a/view/tpl/cloud_actionspanel.tpl +++ b/view/tpl/cloud_actionspanel.tpl @@ -18,7 +18,7 @@ <div class="clear"></div> <label for="files-upload">{{$upload_header}}</label> <div class="clear"></div> - <input class="form-group pull-left" id="files-upload" type="file" name="file"> + <input class="form-group pull-left" id="files-upload" type="file" name="file[]" multiple> <button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button> </form> <div class="clear"></div> |