summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-02-14 23:03:27 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-02-14 23:03:27 +0100
commit9fac95c2ab46a734607657bbad6f164aaa61286f (patch)
treefc035f83bc812fd4b2f36427bb130ddabf71433e /apps/files_trashbin
parentb330d07b51a983dc563a91244a3c83e691c9e97d (diff)
parentdf282d9ef8e040833574fac5c5fd3cbbae1b3209 (diff)
downloadnextcloud-server-9fac95c2ab46a734607657bbad6f164aaa61286f.tar.gz
nextcloud-server-9fac95c2ab46a734607657bbad6f164aaa61286f.zip
Merge branch 'master' into scrutinizer_documentation_patches
Conflicts: lib/private/appconfig.php
Diffstat (limited to 'apps/files_trashbin')
-rw-r--r--apps/files_trashbin/ajax/preview.php2
-rw-r--r--apps/files_trashbin/lib/trashbin.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php
index 44738734b19..ce64d9ecc9f 100644
--- a/apps/files_trashbin/ajax/preview.php
+++ b/apps/files_trashbin/ajax/preview.php
@@ -11,7 +11,7 @@ if(!\OC_App::isEnabled('files_trashbin')){
exit;
}
-$file = array_key_exists('file', $_GET) ? (string) urldecode($_GET['file']) : '';
+$file = array_key_exists('file', $_GET) ? (string) $_GET['file'] : '';
$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '44';
$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '44';
$scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true;
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 6d2d3f08112..56ab2e72c7b 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -1007,6 +1007,6 @@ class Trashbin {
}
public static function preview_icon($path) {
- return \OC_Helper::linkToRoute( 'core_ajax_trashbin_preview', array('x' => 36, 'y' => 36, 'file' => urlencode($path) ));
+ return \OC_Helper::linkToRoute( 'core_ajax_trashbin_preview', array('x' => 36, 'y' => 36, 'file' => $path ));
}
}