diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-02-14 14:34:20 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-02-14 14:34:20 +0100 |
| commit | d7f454771769d37e06136332f15695a98275f0f5 (patch) | |
| tree | 687d4cee17b79d16ed3060c94fe9a896a9883aa8 /apps/files_trashbin | |
| parent | 595b908b740d36fba9aeeaa51e9c533969efaf0c (diff) | |
| parent | d49c7ad4fb1745600f33f0acc67fa39faca3e3e4 (diff) | |
| download | nextcloud-server-d7f454771769d37e06136332f15695a98275f0f5.tar.gz nextcloud-server-d7f454771769d37e06136332f15695a98275f0f5.zip | |
Merge pull request #6726 from owncloud/fix_6630
don't urldecode get var, php does this automatically
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/ajax/preview.php | 2 | ||||
| -rw-r--r-- | apps/files_trashbin/lib/trashbin.php | 2 |
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 7544980e071..9b7d578c990 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -996,6 +996,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 )); } } |