aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-03 14:39:03 -0800
committerfriendica <info@friendica.com>2015-03-03 14:39:03 -0800
commit52f42e7d8131f4b68fb6277e1ae286e7e76ad75d (patch)
tree5a1191513b0b5236cc571a05f20393ecb0af968a /boot.php
parent44b714d0eb13263d5900bd8d51bf3995388f4bd0 (diff)
parente3a559128dc9565474b7db9068f6414f7ae6d4e2 (diff)
downloadvolse-hubzilla-52f42e7d8131f4b68fb6277e1ae286e7e76ad75d.tar.gz
volse-hubzilla-52f42e7d8131f4b68fb6277e1ae286e7e76ad75d.tar.bz2
volse-hubzilla-52f42e7d8131f4b68fb6277e1ae286e7e76ad75d.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 06813099f..4ed5d34c4 100755
--- a/boot.php
+++ b/boot.php
@@ -1553,7 +1553,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) {
'$form_id' => $form_id,
'$lname' => array('username', t('Email') , '', ''),
'$lpassword' => array('password', t('Password'), '', ''),
- '$remember' => array('remember', t('Remember me'), '', ''),
+ '$remember' => array('remember', t('Remember me'), '', '',array(t('No'),t('Yes'))),
'$hiddens' => $hiddens,
'$register' => $reg,
'$lostpass' => t('Forgot your password?'),
@@ -2339,4 +2339,4 @@ function check_cron_broken() {
. 'Content-transfer-encoding: 8bit' );
set_config('system','lastpollcheck',datetime_convert());
return;
-} \ No newline at end of file
+}