From 8f741dd58d640e5279ca71f9ab786766a731b7fc Mon Sep 17 00:00:00 2001
From: "Niklas (Krymonota)" <Krymonota@users.noreply.github.com>
Date: Thu, 6 Aug 2020 17:23:31 +0200
Subject: [PATCH] Use generic value for default cookie prefix

... so that it doesn't have to be adjusted for new versions.
---
 com.woltlab.wcf/option.xml                           | 2 +-
 wcfsetup/install/files/lib/system/WCFSetup.class.php | 2 +-
 wcfsetup/install/files/options.inc.php               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 967d643ddd..9fd0072be3 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -599,7 +599,7 @@ private:wcf.acp.option.exception_privacy.private</selectoptions>
 			<option name="cookie_prefix">
 				<categoryname>general.system.cookie</categoryname>
 				<optiontype>text</optiontype>
-				<defaultvalue>wsc52_</defaultvalue>
+				<defaultvalue>wsc_</defaultvalue>
 				<validationpattern>^[a-zA-Z0-9_]+$</validationpattern>
 			</option>
 			<!-- /general.system.cookie-->
diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index 89ced00ae4..2c2affebcf 100644
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -1281,7 +1281,7 @@ class WCFSetup extends WCF {
 			$useRandomCookiePrefix = false;
 		}
 		
-		$prefix = 'wsc52_';
+		$prefix = 'wsc_';
 		if ($useRandomCookiePrefix) {
 			$cookieNames = array_keys($_COOKIE);
 			while (true) {
diff --git a/wcfsetup/install/files/options.inc.php b/wcfsetup/install/files/options.inc.php
index 546c4c658e..30931b0d70 100644
--- a/wcfsetup/install/files/options.inc.php
+++ b/wcfsetup/install/files/options.inc.php
@@ -8,7 +8,7 @@
  */
 define('LAST_UPDATE_TIME', TIME_NOW);
 
-$prefix = 'wsc52_';
+$prefix = 'wsc_';
 if (file_exists(WCF_DIR . 'cookiePrefix.txt')) {
 	// randomized cookie prefix during setup
 	$prefix = file_get_contents(WCF_DIR . 'cookiePrefix.txt');
-- 
2.20.1