diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-12-15 02:21:26 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-12-15 02:21:26 +0100 |
| commit | 946d58eaa8f93eb612a277fad1d7f870554b578e (patch) | |
| tree | 18ad2ac0c504eb283d70c040ce449b259d88f97f /apps/files/js | |
| parent | 7969d6e64617235744889df42d0e671085a779a8 (diff) | |
| parent | 6ff38624a717316d7992c81db6d4dbf8f5d86f3a (diff) | |
| download | nextcloud-server-946d58eaa8f93eb612a277fad1d7f870554b578e.tar.gz nextcloud-server-946d58eaa8f93eb612a277fad1d7f870554b578e.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
| -rw-r--r-- | apps/files/js/files.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 9f0bafafbdf..96dd0323d29 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -288,7 +288,7 @@ var FileList={ }, finishDelete:function(ready,sync){ if(!FileList.deleteCanceled && FileList.deleteFiles){ - var fileNames=FileList.deleteFiles.join(';'); + var fileNames=JSON.stringify(FileList.deleteFiles); $.ajax({ url: OC.filePath('files', 'ajax', 'delete.php'), async:!sync, diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 3f25e3bb3a3..a1f94ad1784 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -845,7 +845,7 @@ function getMimeIcon(mime, ready){ if(getMimeIcon.cache[mime]){ ready(getMimeIcon.cache[mime]); }else{ - $.get( OC.filePath('files','ajax','mimeicon.php')+'&mime='+mime, function(path){ + $.get( OC.filePath('files','ajax','mimeicon.php'), {mime: mime}, function(path){ getMimeIcon.cache[mime]=path; ready(getMimeIcon.cache[mime]); }); |