summaryrefslogtreecommitdiffstats
path: root/core/templates/404.php
diff options
context:
space:
mode:
authorBrice Maron <brice@bmaron.net>2012-06-14 21:16:59 +0000
committerBrice Maron <brice@bmaron.net>2012-06-14 21:16:59 +0000
commit4753cc3ebde9867ab4deb1979fb4231b0c847426 (patch)
treec6944e947bc84c8716b57b7e2b06ef51efccb3db /core/templates/404.php
parent6da5a2fdd4e8a19ab993b4a1f7de7e45b8922a16 (diff)
parentf3b30e4658c4dde82b56b458c672fa5edcba5d6b (diff)
downloadnextcloud-server-4753cc3ebde9867ab4deb1979fb4231b0c847426.tar.gz
nextcloud-server-4753cc3ebde9867ab4deb1979fb4231b0c847426.zip
Merge branch 'master' into multi_app_dir
Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php
Diffstat (limited to 'core/templates/404.php')
-rw-r--r--core/templates/404.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/templates/404.php b/core/templates/404.php
index cd4f2b40bb2..13a81010343 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -10,6 +10,6 @@ if(!isset($_)){//also provide standalone error page
<ul>
<li class='error'>
<?php echo $l->t( 'Cloud not found' ); ?><br/>
- <p class='hint'><?php if(isset($_['file'])) echo htmlentities($_['file'])?></p>
+ <p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p>
</li>
</ul>