From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 17 Jun 2019 16:22:07 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.0_Alpha_1~47
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=781af204dea6e57f72331757df49a7d70dbe1942;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

781af204dea6e57f72331757df49a7d70dbe1942
diff --cc wcfsetup/install/files/lib/system/user/notification/event/TReactionUserNotificationEvent.class.php
index 8af1f21f18,7f138d73a3..38543c4a4c
--- a/wcfsetup/install/files/lib/system/user/notification/event/TReactionUserNotificationEvent.class.php
+++ b/wcfsetup/install/files/lib/system/user/notification/event/TReactionUserNotificationEvent.class.php
@@@ -7,10 -5,11 +7,8 @@@ use wcf\system\WCF
  
  /**
   * This trait can be used in likeable user notification events to determine the reactionType counts
 - * for a specific user notification object.
 + * for a specific user notification object. 
   * 
-  * @TODO backport to WSC 3.1
 - * HEADS UP: This trait is only included in version 3.0 and 3.1 for compatibility reasons. The method 
 - * getReactionsForAuthors() throws a \BadMethodCallException exception, if it used in version 3.0 or 3.1.
-- *
   * @author	Joshua Ruesweg
   * @copyright	2001-2019 WoltLab GmbH
   * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
diff --cc wcfsetup/install/files/lib/util/PasswordUtil.class.php
index ec2b95e537,49d488c767..f872172624
--- a/wcfsetup/install/files/lib/util/PasswordUtil.class.php
+++ b/wcfsetup/install/files/lib/util/PasswordUtil.class.php
@@@ -561,7 -580,7 +561,7 @@@ final class PasswordUtil 
  	 * @return	boolean
  	 */
  	protected static function wcf2($username, $password, $salt, $dbHash) {
- 		return \hash_equals($dbHash, self::getDoubleSaltedHash($password, $salt));
 -		return CryptoUtil::secureCompare($dbHash, self::getDoubleSaltedHash($password, $dbHash));
++		return \hash_equals($dbHash, self::getDoubleSaltedHash($password, $dbHash));
  	}
  	
  	/**