From: Joshua Rüsweg <josh@bastelstu.be>
Date: Thu, 18 Aug 2016 15:29:32 +0000 (+0200)
Subject: Fix language var (#2078)
X-Git-Tag: 3.0.0_Beta_1~691
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=735b44ad4ff539f9cdd5891d1cd0f9e66846337b;p=GitHub%2FWoltLab%2FWCF.git

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 f39f41a1a9..495dd53af1 100644
--- 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 5f9c511f70..dcf31b5aa5 100644
--- 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