From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 24 Mar 2018 18:52:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/origin/3.0'
X-Git-Tag: 3.1.2~57
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=07b889fc8b01d258fda2ca8795984f88aa788e9b;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
#	com.woltlab.wcf/option.xml
---

07b889fc8b01d258fda2ca8795984f88aa788e9b
diff --cc com.woltlab.wcf/option.xml
index 41625adaf9,ea09edbdd8..d412a78ece
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@@ -610,8 -539,8 +610,8 @@@ private:wcf.acp.option.exception_privac
  			<option name="cookie_prefix">
  				<categoryname>general.system.cookie</categoryname>
  				<optiontype>text</optiontype>
 -				<defaultvalue>wsc30_</defaultvalue>
 +				<defaultvalue>wsc31_</defaultvalue>
- 				<validationpattern>.+</validationpattern>
+ 				<validationpattern>^[a-zA-Z0-9_]+$</validationpattern>
  			</option>
  			<!-- /general.system.cookie-->