From: Tim Düsterhus Date: Mon, 16 May 2022 09:41:07 +0000 (+0200) Subject: Merge branch '5.5' X-Git-Tag: 6.0.0_Alpha_1~1296 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f3fb2fba96a98904deb7640c4972803f8ff22c40;p=GitHub%2FWoltLab%2FWCF.git Merge branch '5.5' --- f3fb2fba96a98904deb7640c4972803f8ff22c40 diff --cc wcfsetup/install/files/lib/system/WCF.class.php index 5ad42d7ee4,7fec9f3b3c..9dfec8631d --- a/wcfsetup/install/files/lib/system/WCF.class.php +++ b/wcfsetup/install/files/lib/system/WCF.class.php @@@ -482,8 -496,9 +482,12 @@@ class WC // The captcha option related to the removed SearchForm was removed in 5.5. \define('SEARCH_USE_CAPTCHA', 0); + // The prompt for desktop notifications is no longer obtrusive since 5.5. + // https://github.com/WoltLab/WCF/issues/4806 + \define('ENABLE_DESKTOP_NOTIFICATIONS', 1); ++ + // Disabling X-Frame-Options is no longer possible since 5.6. + \define('HTTP_SEND_X_FRAME_OPTIONS', 1); } /**