Merge branch 'master' into next

diff --cc wcfsetup/install/files/js/WCF.js
Simple merge

diff --cc wcfsetup/install/files/lib/data/reaction/object/IReactionObject.class.php
Simple merge

diff --cc wcfsetup/install/files/lib/system/user/notification/event/TReactionUserNotificationEvent.class.php
index 8af1f21f18073c12023df7b668f21216d7acedfa,7f138d73a317cc7d8a84d2563fb6c8c16fd93e89..38543c4a4ca02e5661a97056317125f75a703de1
--- 1/wcfsetup/install/files/lib/system/user/notification/event/TReactionUserNotificationEvent.class.php
--- 2/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 ec2b95e53714873a335e4847854e35ef20fc23ff,49d488c7671b19836c9e47f231b2c1014899a4dd..f8721726245ff9469d3cadda470a2449b9690274
--- 1/wcfsetup/install/files/lib/util/PasswordUtil.class.php
--- 2/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));
        }
        
        /**