fix restore from files in sub-folders

diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index e39004cc0d54ee5758e6d6251d0690b82d1c7f68..876ad269a70ad757f439cf9f0fd80b08fd339782 100644 (file)
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -13,6 +13,7 @@ $success = array();
 $i = 0;
 foreach ($list as $file) {
        if ( $dirlisting === '0') {
+               $file = ltrim($file, '/');
                $delimiter = strrpos($file, '.d');
                $filename = substr($file, 0, $delimiter);
                $timestamp =  substr($file, $delimiter+2);

diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 84c23d66992143a86d3a46b97809259e56194c18..2c1af34ccecef3c0701d464716a25e2788ab760f 100644 (file)
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -8,7 +8,7 @@ $(document).ready(function() {
                        deleteAction.removeClass('delete-icon').addClass('progress-icon');
                        disableActions();
                        $.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'),
-                                       {files: JSON.stringify([filename]), dirlisting: tr.attr('data-dirlisting')},
+                                       {files: JSON.stringify([$('#dir').val() + '/' + filename]), dirlisting: tr.attr('data-dirlisting')},
                                        function(result) {
                                                for (var i = 0; i < result.data.success.length; i++) {
                                                        var row = document.getElementById(result.data.success[i].filename);
@@ -229,7 +229,7 @@ function getSelectedFiles(property){
        elements.each(function(i,element){
                var file={
                        name:$(element).attr('data-filename'),
-                       file:$(element).attr('data-file'),
+                       file:$('#dir').val() + "/" + $(element).attr('data-file'),
                        timestamp:$(element).attr('data-timestamp'),
                        type:$(element).attr('data-type'),
                        dirlisting:$(element).attr('data-dirlisting')