diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-06-13 15:17:46 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-06-13 15:17:46 -0400 |
| commit | b5889d6ffe2a91ccb223a84a220cb1580bc42929 (patch) | |
| tree | aca675ac30746341e8ed835a9cb233cf76a7e2cc /core/templates | |
| parent | bd01e9346941fa85b4bb96a42cecdbc50e51c368 (diff) | |
| parent | f9bf34340c7618a90f8ac3452b7d89085882cab3 (diff) | |
| download | nextcloud-server-b5889d6ffe2a91ccb223a84a220cb1580bc42929.tar.gz nextcloud-server-b5889d6ffe2a91ccb223a84a220cb1580bc42929.zip | |
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/404.php | 2 | ||||
| -rw-r--r-- | core/templates/login.php | 2 |
2 files changed, 2 insertions, 2 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> diff --git a/core/templates/login.php b/core/templates/login.php index 41d6ba41ef8..a40bf5c330a 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -1,7 +1,7 @@ <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]--> <form action="index.php" method="post"> <fieldset> - <?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.htmlentities($_['redirect']).'" />'; } ?> + <?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect'].'" />'; } ?> <?php if($_['error']): ?> <a href="./core/lostpassword/"><?php echo $l->t('Lost your password?'); ?></a> <?php endif; ?> |