Merge branch '5.3'

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

diff --git a/userOption.xml b/userOption.xml
index 85b1e7f9ca88a2af4c2c11cf1bc2435c3ca7b397..5ed9b4f78ef20baf45dd6dcbda676c651cf6193f 100644 (file)
--- a/userOption.xml
+++ b/userOption.xml
@@ -1,43 +1,42 @@
-<?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/vortex/userOption.xsd">
+<?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/2019/userOption.xsd">
        <import>
                <options>
                        <option name="canSendConversation">
                                <categoryname>settings.privacy.messaging</categoryname>
                                <optiontype>select</optiontype>
-                               <editable>3</editable>
+                               <defaultvalue>0</defaultvalue>
+                               <options>module_conversation</options>
                                <selectoptions>0:wcf.user.access.registered
 1:wcf.user.access.following
 2:wcf.user.access.nobody</selectoptions>
-                               <defaultvalue>0</defaultvalue>
-                               <options>module_conversation</options>
+                               <editable>3</editable>
                        </option>
-                       
                        <option name="conversationsPerPage">
                                <categoryname>settings.general.appearance</categoryname>
                                <optiontype>select</optiontype>
-                               <editable>3</editable>
                                <defaultvalue>0</defaultvalue>
+                               <options>module_conversation</options>
                                <selectoptions>0:wcf.global.defaultValue
 5
 10
 20
 30
 40</selectoptions>
-                               <options>module_conversation</options>
+                               <editable>3</editable>
                        </option>
                        <option name="conversationMessagesPerPage">
                                <categoryname>settings.general.appearance</categoryname>
                                <optiontype>select</optiontype>
-                               <editable>3</editable>
                                <defaultvalue>0</defaultvalue>
+                               <options>module_conversation</options>
                                <selectoptions>0:wcf.global.defaultValue
 5
 10
 20
 30
 40</selectoptions>
-                               <options>module_conversation</options>
+                               <editable>3</editable>
                        </option>
                </options>
        </import>