summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/templates
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-07-24 09:35:33 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2013-07-24 09:35:33 +0200
commit1a73e607bdba6d654936bde632acaa4960dec729 (patch)
tree66e80e3fad82a91dd402582e08f0a97775a93502 /apps/files_sharing/templates
parent7242480049d1fcc32fba0d1acb7c8572d7b9350f (diff)
parent7bb6aab8eea731840d67d5e3aa302c04a593a4e0 (diff)
downloadnextcloud-server-1a73e607bdba6d654936bde632acaa4960dec729.tar.gz
nextcloud-server-1a73e607bdba6d654936bde632acaa4960dec729.zip
Merge branch 'master' into more-themable-strings
Conflicts: lib/template.php
Diffstat (limited to 'apps/files_sharing/templates')
-rw-r--r--apps/files_sharing/templates/authenticate.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index fa03f419130..2c89b5df3f6 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -1,6 +1,6 @@
<form action="<?php p($_['URL']); ?>" method="post">
<fieldset>
- <?php if ($_['wrongpw']): ?>
+ <?php if (isset($_['wrongpw'])): ?>
<div class="warning"><?php p($l->t('The password is wrong. Try again.')); ?></div>
<?php endif; ?>
<p class="infield">