From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 12 Mar 2014 15:54:45 +0000 (+0100)
Subject: Google+ profile field can handle custom URLs now
X-Git-Tag: 2.0.4~20
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=699cc524fa9d58312033acde271f5c889b18cf4b;p=GitHub%2FWoltLab%2FWCF.git

Google+ profile field can handle custom URLs now
---

diff --git a/com.woltlab.wcf/userOption.xml b/com.woltlab.wcf/userOption.xml
index f275ecd519..683bd4321f 100644
--- a/com.woltlab.wcf/userOption.xml
+++ b/com.woltlab.wcf/userOption.xml
@@ -170,8 +170,8 @@
 				<categoryname>profile.contact</categoryname>
 				<optiontype>text</optiontype>
 				<outputclass>wcf\system\option\user\GooglePlusUserOptionOutput</outputclass>
-				<validationpattern>^$|^[0-9]{21}$</validationpattern>
-				<contentpattern>^https?://plus.google.com/([0-9]{21})$</contentpattern>
+				<validationpattern>^$|^[0-9]{21}$|^\+[a-zA-Z0-9]+$</validationpattern>
+				<contentpattern>^https?://(?:plus|www).google.com/([0-9]{21}|\+[a-zA-Z0-9]+)$</contentpattern>
 				<searchable>1</searchable>
 				<visible>15</visible>
 				<editable>3</editable>