X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fregister.php;h=f346e4b9c805ba9d89c7b9751ee240caac988cd2;hb=d3679822530e351894ca1f809c97638873832a74;hp=16e80ef1714a84cf5bf1a3eab198ecafa63831e2;hpb=d758c117843dec04b061263095baeea7697b05a4;p=quix0rs-gnu-social.git

diff --git a/actions/register.php b/actions/register.php
index 16e80ef171..f346e4b9c8 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -49,7 +49,7 @@ class RegisterAction extends Action {
 
 		if (!$this->boolean('license')) {
 			$this->show_form(_t('You can\'t register if you don\'t agree to the license.'));
-		} else if (!Validate::email($email, true)) {
+		} else if ($email && !Validate::email($email, true)) {
 			$this->show_form(_t('Not a valid email address.'));
 		} else if (!Validate::string($nickname, array('min_length' => 1,
 													  'max_length' => 64,
@@ -69,6 +69,10 @@ class RegisterAction extends Action {
 				common_server_error(_t('Error setting user.'));
 				return;
 			}
+			common_real_login(true);
+			if ($this->boolean('rememberme')) {
+				common_rememberme();
+			}
 			common_redirect(common_local_url('profilesettings'));
 		} else {
 			$this->show_form(_t('Invalid username or password.'));
@@ -170,6 +174,9 @@ class RegisterAction extends Action {
 						_t('Same as password above'));
 		common_input('email', _t('Email'), NULL,
 					 _t('Used only for updates, announcements, and password recovery'));
+		common_checkbox('rememberme', _t('Remember me'),
+		                _t('Automatically login in the future; ' . 
+		                   'not for shared computers!'));
 		common_element_start('p');
 		common_element('input', array('type' => 'checkbox',
 									  'id' => 'license',