summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-01-30 16:31:47 +0100
committerVincent Petry <pvince81@owncloud.com>2014-01-30 16:34:37 +0100
commitd49c7ad4fb1745600f33f0acc67fa39faca3e3e4 (patch)
tree471c551d91cc9209de841f188678ec71e09114cd
parentf7c291e2768b83176aad6dacbf0139949c2208fd (diff)
downloadnextcloud-server-d49c7ad4fb1745600f33f0acc67fa39faca3e3e4.tar.gz
nextcloud-server-d49c7ad4fb1745600f33f0acc67fa39faca3e3e4.zip
Fixed double file encoding for previews
-rw-r--r--apps/files_sharing/templates/public.php2
-rw-r--r--apps/files_trashbin/lib/trashbin.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 3ddaf4446df..3eb84ce1672 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -35,7 +35,7 @@
<?php else: ?>
<div id="imgframe">
<?php $size = \OC\Preview::isMimeSupported($_['mimetype']) ? 500 : 128 ?>
- <img src="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => $size, 'y' => $size, 'file' => urlencode($_['directory_path']), 't' => $_['dirToken']))); ?>" class="publicpreview"/>
+ <img src="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => $size, 'y' => $size, 'file' => $_['directory_path'], 't' => $_['dirToken']))); ?>" class="publicpreview"/>
</div>
<?php endif; ?>
<div class="directDownload">
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 ));
}
}