Merge branch '3.0' into 3.1

[GitHub/WoltLab/com.woltlab.wcf.conversation.git] / userOption.xml

diff --git a/userOption.xml b/userOption.xml
index 9ad7eb38f69282efb63c44c4e637af429eb29c22..85b1e7f9ca88a2af4c2c11cf1bc2435c3ca7b397 100644 (file)
--- a/userOption.xml
+++ b/userOption.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/userOption.xsd">
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/vortex/userOption.xsd">
        <import>
                <options>
                        <option name="canSendConversation">
                                <categoryname>settings.privacy.messaging</categoryname>
                                <optiontype>select</optiontype>
                                <editable>3</editable>
-                               <selectoptions><![CDATA[0:wcf.user.access.registered
+                               <selectoptions>0:wcf.user.access.registered
 1:wcf.user.access.following
-2:wcf.user.access.nobody]]></selectoptions>
+2:wcf.user.access.nobody</selectoptions>
                                <defaultvalue>0</defaultvalue>
                                <options>module_conversation</options>
                        </option>
@@ -18,12 +18,12 @@
                                <optiontype>select</optiontype>
                                <editable>3</editable>
                                <defaultvalue>0</defaultvalue>
-                               <selectoptions><![CDATA[0:wcf.global.defaultValue
+                               <selectoptions>0:wcf.global.defaultValue
 5
 10
 20
 30
-40]]></selectoptions>
+40</selectoptions>
                                <options>module_conversation</options>
                        </option>
                        <option name="conversationMessagesPerPage">
@@ -31,12 +31,12 @@
                                <optiontype>select</optiontype>
                                <editable>3</editable>
                                <defaultvalue>0</defaultvalue>
-                               <selectoptions><![CDATA[0:wcf.global.defaultValue
+                               <selectoptions>0:wcf.global.defaultValue
 5
 10
 20
 30
-40]]></selectoptions>
+40</selectoptions>
                                <options>module_conversation</options>
                        </option>
                </options>