From 79c2f5e5c06d11c9c8a8687640ca25d720814cdb Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Sat, 23 Apr 2016 20:13:03 +0200 Subject: [PATCH] Removed obsolete code --- wcfsetup/install/files/lib/form/LoginForm.class.php | 13 ------------- .../install/files/lib/form/RegisterForm.class.php | 9 --------- 2 files changed, 22 deletions(-) diff --git a/wcfsetup/install/files/lib/form/LoginForm.class.php b/wcfsetup/install/files/lib/form/LoginForm.class.php index f7d27ffab1..9a998ebd7c 100644 --- a/wcfsetup/install/files/lib/form/LoginForm.class.php +++ b/wcfsetup/install/files/lib/form/LoginForm.class.php @@ -36,19 +36,6 @@ class LoginForm extends \wcf\acp\form\LoginForm { public function readFormParameters() { parent::readFormParameters(); - if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'register') { - // if the username field is an email, save it as email for the registration - if (UserUtil::isValidEmail($this->username)) { - WCF::getSession()->register('__email', $this->username); - } - else { - WCF::getSession()->register('__username', $this->username); - } - WCF::getSession()->update(); - HeaderUtil::redirect(LinkHandler::getInstance()->getLink('Register')); - exit; - } - $this->useCookies = 0; if (isset($_POST['useCookies'])) $this->useCookies = intval($_POST['useCookies']); } diff --git a/wcfsetup/install/files/lib/form/RegisterForm.class.php b/wcfsetup/install/files/lib/form/RegisterForm.class.php index f9df10038f..4ebe9063ac 100644 --- a/wcfsetup/install/files/lib/form/RegisterForm.class.php +++ b/wcfsetup/install/files/lib/form/RegisterForm.class.php @@ -186,15 +186,6 @@ class RegisterForm extends UserAddForm { if (empty($_POST)) { $this->languageID = WCF::getLanguage()->languageID; - if (WCF::getSession()->getVar('__username')) { - $this->username = WCF::getSession()->getVar('__username'); - WCF::getSession()->unregister('__username'); - } - if (WCF::getSession()->getVar('__email')) { - $this->email = $this->confirmEmail = WCF::getSession()->getVar('__email'); - WCF::getSession()->unregister('__email'); - } - WCF::getSession()->register('registrationStartTime', TIME_NOW); // generate random field names -- 2.20.1