From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 20 Sep 2021 13:36:51 +0000 (+0200)
Subject: Merge branch '5.4'
X-Git-Tag: 5.5.0_Alpha_1~445
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5e88e23729016a9798af11f25b73cb9adc6ec541;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.4'
---

5e88e23729016a9798af11f25b73cb9adc6ec541
diff --cc wcfsetup/install/files/lib/system/WCFSetup.class.php
index 594d512332,1c3ca4544d..f8b2525c25
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@@ -36,8 -36,9 +36,8 @@@ use wcf\util\XML
  
  // define
  \define('PACKAGE_ID', 0);
- \define('HTTP_SEND_X_FRAME_OPTIONS', 0);
+ \define('HTTP_SEND_X_FRAME_OPTIONS', 1);
  \define('CACHE_SOURCE_TYPE', 'disk');
 -\define('MODULE_MASTER_PASSWORD', 1);
  \define('ENABLE_DEBUG_MODE', 1);
  \define('ENABLE_BENCHMARK', 0);
  \define('ENABLE_ENTERPRISE_MODE', 0);