diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-07-10 12:41:53 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-07-10 12:41:53 +0200 |
| commit | a357e5b284ed5b752864e4570cb179f3f2d88229 (patch) | |
| tree | e811ea2288b5dfa069908f25f696f795a268cb53 /apps/files_trashbin/templates | |
| parent | 832779804d36d27c47325d1dcce09e566c8cee60 (diff) | |
| parent | 5387e5c354440b264040816ea7fcaf6783a2ebdc (diff) | |
| download | nextcloud-server-a357e5b284ed5b752864e4570cb179f3f2d88229.tar.gz nextcloud-server-a357e5b284ed5b752864e4570cb179f3f2d88229.zip | |
merge conflicts ...
Diffstat (limited to 'apps/files_trashbin/templates')
| -rw-r--r-- | apps/files_trashbin/templates/index.php | 2 | ||||
| -rw-r--r-- | apps/files_trashbin/templates/part.breadcrumb.php | 3 | ||||
| -rw-r--r-- | apps/files_trashbin/templates/part.list.php | 6 |
3 files changed, 4 insertions, 7 deletions
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php index cb5edaa2c91..66ec36df867 100644 --- a/apps/files_trashbin/templates/index.php +++ b/apps/files_trashbin/templates/index.php @@ -18,7 +18,7 @@ <span class='selectedActions'> <a href="" class="undelete"> <img class="svg" alt="<?php p($l->t( 'Restore' )); ?>" - src="<?php print_unescaped(OCP\image_path("core", "actions/undelete.png")); ?>" /> + src="<?php print_unescaped(OCP\image_path("core", "actions/history.svg")); ?>" /> <?php p($l->t('Restore'))?> </a> </span> diff --git a/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php index 2801e04e9ad..85bb16ffa2d 100644 --- a/apps/files_trashbin/templates/part.breadcrumb.php +++ b/apps/files_trashbin/templates/part.breadcrumb.php @@ -11,8 +11,7 @@ <?php endif;?> <?php for($i=0; $i<count($_["breadcrumb"]); $i++): $crumb = $_["breadcrumb"][$i]; - $dir = str_replace('+', '%20', urlencode($crumb["dir"])); - $dir = str_replace('%2F', '/', $dir); ?> + $dir = \OCP\Util::encodePath($crumb["dir"]); ?> <div class="crumb <?php if($i == count($_["breadcrumb"])-1) p('last');?> svg" data-dir='<?php p($dir);?>'> <a href="<?php p($_['baseURL'].$dir); ?>"><?php p($crumb["name"]); ?></a> diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php index 3f260867582..44e2fc7293b 100644 --- a/apps/files_trashbin/templates/part.list.php +++ b/apps/files_trashbin/templates/part.list.php @@ -4,10 +4,8 @@ // the older the file, the brighter the shade of grey; days*14 $relative_date_color = round((time()-$file['date'])/60/60/24*14); if($relative_date_color>200) $relative_date_color = 200; - $name = str_replace('+', '%20', urlencode($file['name'])); - $name = str_replace('%2F', '/', $name); - $directory = str_replace('+', '%20', urlencode($file['directory'])); - $directory = str_replace('%2F', '/', $directory); ?> + $name = \OCP\Util::encodePath($file['name']); + $directory = \OCP\Util::encodePath($file['directory']); ?> <tr data-filename="<?php p($file['name']);?>" data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>" data-mime="<?php p($file['mimetype'])?>" |