Fix language var (#2078)

* minor improvements

* remove superflouse import

diff --git a/wcfsetup/install/files/lib/form/EmailActivationForm.class.php b/wcfsetup/install/files/lib/form/EmailActivationForm.class.php
index f39f41a1a9b4051593671f82dd662093de3d81e0..495dd53af180d73b9831734313ddee751f9f9287 100644 (file)
--- a/wcfsetup/install/files/lib/form/EmailActivationForm.class.php
+++ b/wcfsetup/install/files/lib/form/EmailActivationForm.class.php
@@ -109,7 +109,7 @@ class EmailActivationForm extends AbstractForm {
                $this->saved();
                
                // forward to index page
-               HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink(), WCF::getLanguage()->get('wcf.user.emailActivation.success'));
+               HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink(), WCF::getLanguage()->getDynamicVariable('wcf.user.emailActivation.success'));
                exit;
        }
        

diff --git a/wcfsetup/install/files/lib/form/NewPasswordForm.class.php b/wcfsetup/install/files/lib/form/NewPasswordForm.class.php
index 5f9c511f7041e4f70a2027f0e57c70b560cd0a03..dcf31b5aa576d34ca62a99495596cb596e7a362c 100644 (file)
--- a/wcfsetup/install/files/lib/form/NewPasswordForm.class.php
+++ b/wcfsetup/install/files/lib/form/NewPasswordForm.class.php
@@ -7,8 +7,8 @@ use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\UserInputException;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
+use wcf\util\CryptoUtil;
 use wcf\util\HeaderUtil;
-use wcf\util\PasswordUtil;
 use wcf\util\StringUtil;
 use wcf\util\UserRegistrationUtil;
 
@@ -68,7 +68,7 @@ class NewPasswordForm extends AbstractForm {
                
                if ($this->lostPasswordKey) {
                        if (!$this->user->lostPasswordKey) throw new IllegalLinkException();
-                       if (!PasswordUtil::secureCompare($this->user->lostPasswordKey, $this->lostPasswordKey)) {
+                       if (!CryptoUtil::secureCompare($this->user->lostPasswordKey, $this->lostPasswordKey)) {
                                throw new IllegalLinkException();
                        }
                        // expire lost password requests after a day