Use generic value for default cookie prefix

... so that it doesn't have to be adjusted for new versions.

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 967d643ddda8e577aea198a036cc7b0dafbd48e1..9fd0072be3a18fdd49a9459c09b6388b7f7b6205 100644 (file)
--- 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 89ced00ae4b320b250df55cfd858aea49a39c307..2c2affebcf3cad6de67be4151b0c37bdc6fe560e 100644 (file)
--- 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 546c4c658effd7e2598a2d2fee2aabd6e7ba6d40..30931b0d7020a3963c3a6a5cafd65648fc533342 100644 (file)
--- 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');