summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoricewind1991 <icewind1991@gmail.com>2013-02-27 12:29:39 -0800
committericewind1991 <icewind1991@gmail.com>2013-02-27 12:29:39 -0800
commita8bab023b2095b5b78c05b1ebadb73bb46459509 (patch)
tree8ce4d9f219cbd2a19a328f565b5ec813d732dd10
parent766a301a6b1832f98c30a09e0218a2e00925d401 (diff)
parent1f9551a382f42243c9cfece684e1f14508b88c3c (diff)
downloadnextcloud-server-a8bab023b2095b5b78c05b1ebadb73bb46459509.tar.gz
nextcloud-server-a8bab023b2095b5b78c05b1ebadb73bb46459509.zip
Merge pull request #1969 from j-ed/master
OC5 beta 2 - prevent multiple slashes in a row when building URLs.
-rw-r--r--apps/files/templates/part.list.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 3c6c5dbd267..eefebd6649b 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -28,9 +28,9 @@
>
<?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
<?php if($file['type'] == 'dir'): ?>
- <a class="name" href="<?php echo $_['baseURL'].$directory.'/'.$name; ?>" title="">
+ <a class="name" href="<?php echo rtrim($_['baseURL'],'/').'/'.trim($directory,'/').'/'.$name; ?>" title="">
<?php else: ?>
- <a class="name" href="<?php echo $_['downloadURL'].$directory.'/'.$name; ?>" title="">
+ <a class="name" href="<?php echo rtrim($_['downloadURL'],'/').'/'.trim($directory,'/').'/'.$name; ?>" title="">
<?php endif; ?>
<span class="nametext">
<?php if($file['type'] == 'dir'):?>