Merge master

diff --cc apps/files/templates/part.list.php
index cdd157b27e463e8096d6a154b8722b90290026f8,eefebd6649b4974e7a73ec5145e7eb4d21d5d67d..712625ce6319d358a52395121e1c1c5e2077a959
--- 1/apps/files/templates/part.list.php
--- 2/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@@ -28,9 -28,9 +28,9 @@@
                        >
                <?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
                <?php if($file['type'] == 'dir'): ?>
-                       <a class="name" href="<?php p($_['baseURL'].$directory.'/'.$name); ?>" title="">
 -                      <a class="name" href="<?php echo rtrim($_['baseURL'],'/').'/'.trim($directory,'/').'/'.$name; ?>" title="">
++                      <a class="name" href="<?php p(rtrim($_['baseURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>" title="">
                <?php else: ?>
-                       <a class="name" href="<?php p($_['downloadURL'].$directory.'/'.$name); ?>" title="">
 -                      <a class="name" href="<?php echo rtrim($_['downloadURL'],'/').'/'.trim($directory,'/').'/'.$name; ?>" title="">
++                      <a class="name" href="<?php p(rtrim($_['downloadURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>" title="">
                <?php endif; ?>
                        <span class="nametext">
                                <?php if($file['type'] == 'dir'):?>