From 58decc1421135274511ce27fa1fdcbc9e14f423e Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 30 Nov 2017 13:16:48 +0100
Subject: [PATCH] Updated value of the default cookie prefix

See #2488
---
 com.woltlab.wcf/option.xml                           | 2 +-
 wcfsetup/install/files/lib/system/WCFSetup.class.php | 2 +-
 wcfsetup/install/files/options.inc.php               | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 0794ebb5b8..41625adaf9 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -610,7 +610,7 @@ private:wcf.acp.option.exception_privacy.private</selectoptions>
 			<option name="cookie_prefix">
 				<categoryname>general.system.cookie</categoryname>
 				<optiontype>text</optiontype>
-				<defaultvalue>wsc30_</defaultvalue>
+				<defaultvalue>wsc31_</defaultvalue>
 				<validationpattern>.+</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 8a130a10a1..f83fd2bd72 100644
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -1221,7 +1221,7 @@ class WCFSetup extends WCF {
 		}
 		
 		// determine randomized cookie prefix
-		$prefix = 'wsc30_';
+		$prefix = 'wsc31_';
 		if (!self::$developerMode) {
 			$cookieNames = array_keys($_COOKIE);
 			while (true) {
diff --git a/wcfsetup/install/files/options.inc.php b/wcfsetup/install/files/options.inc.php
index 1c7e18cf6d..58fa2e0705 100644
--- a/wcfsetup/install/files/options.inc.php
+++ b/wcfsetup/install/files/options.inc.php
@@ -8,8 +8,9 @@
  */
 define('LAST_UPDATE_TIME', TIME_NOW);
 
-$prefix = 'wsc30_';
+$prefix = 'wsc31_';
 if (file_exists(WCF_DIR . 'cookiePrefix.txt')) {
+	// randomized cookie prefix during setup
 	$prefix = file_get_contents(WCF_DIR . 'cookiePrefix.txt');
 }
 define('COOKIE_PREFIX', $prefix);
-- 
2.20.1