diff options
-rw-r--r-- | apps/files/ajax/delete.php | 2 | ||||
-rw-r--r-- | apps/files/js/filelist.js | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index da7e9d6b2aa..5f4856ec790 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -8,7 +8,7 @@ OCP\JSON::callCheck(); // Get data $dir = stripslashes($_POST["dir"]); -$files = isset($_POST["file"]) ? stripslashes($_POST["file"]) : stripslashes($_POST["files"]); +$files = isset($_POST["file"]) ? $_POST["file"] : $_POST["files"]; $files = json_decode($files); $filesWithError = ''; diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 70c3332ccaf..b1e9a885063 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -320,9 +320,9 @@ var FileList={ } for (var i=0; i<files.length; i++) { var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete"); - var oldHTML = deleteAction[0].outerHTML; + var oldHTML = deleteAction.html(); var newHTML = '<img class="move2trash" data-action="Delete" title="'+t('files', 'perform delete operation')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>'; - deleteAction[0].outerHTML = newHTML; + deleteAction.html(newHTML); } // Finish any existing actions if (FileList.lastAction) { @@ -344,7 +344,7 @@ var FileList={ } else { $.each(files,function(index,file) { var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash"); - deleteAction[0].outerHTML = oldHTML; + deleteAction.html(oldHTML); }); } }); |