Closes #306

git-svn-id: https://code.elgg.org/elgg/trunk@2330 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 3 insertions, 2 deletions

diff --git a/actions/login.php b/actions/login.php
index 774b6dfaa..c35450698 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -18,7 +18,7 @@
     

         $username = get_input('username');

         $password = get_input("password");

-        $persistent = get_input("persistent");

+        $persistent = get_input("persistent", false);

         

     // If all is present and correct, try to log in  

     	$result = false;          

diff --git a/languages/en.php b/languages/en.php
index 4d74ec2aa..2fbb47e5b 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -467,6 +467,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.",
 	
 			'user:password:text' => 'To generate a new password, enter your username below. We will send the address of a unique verification page to you via email click on the link in the body of the message and a new password will be sent to you.',
 	
+			'user:persistent' => 'Remember me',
 		/**
 		 * Administration
 		 */
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index cd66e3cdb..661ce763c 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -16,7 +16,7 @@
 	$form_body = "<p><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea')) . "</label>";

 	$form_body .= "<br />";

 	$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')) . "</label><br />";

-	$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . "</p>";

+	$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . " <div id=\"persistent_login\"><label><input type=\"checkbox\" name=\"persistent\" value=\"true\" />".elgg_echo('user:persistent')."</label></div></p>";

 	$form_body .= "<p>";

 	$form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "<a href=\"{$vars['url']}account/register.php\">" . elgg_echo('register') . "</a> | " : "";

 	$form_body .= "<a href=\"{$vars['url']}account/forgotten_password.php\">" . elgg_echo('user:password:lost') . "</a></p>";