Migrate to new event organization

diff --git a/files/lib/bootstrap/com.woltlab.wcf.conversation.php b/files/lib/bootstrap/com.woltlab.wcf.conversation.php
index 95d9bba5a0880c53493ae03963c59e10a847cfcf..5882aacf687b3ef79b3944cba0158f7adffbee20 100644 (file)
--- a/files/lib/bootstrap/com.woltlab.wcf.conversation.php
+++ b/files/lib/bootstrap/com.woltlab.wcf.conversation.php
@@ -1,14 +1,16 @@
 <?php
 
 use wcf\system\event\EventHandler;
 <?php
 
 use wcf\system\event\EventHandler;

-use wcf\system\worker\event\RebuildWorkerCollecting;

 
 return static function (): void {
     $eventHandler = EventHandler::getInstance();
 
 
 return static function (): void {
     $eventHandler = EventHandler::getInstance();
 

-    $eventHandler->register(RebuildWorkerCollecting::class, static function (RebuildWorkerCollecting $event) {
-        $event->register(\wcf\system\worker\ConversationMessageRebuildDataWorker::class, -5);
-        $event->register(\wcf\system\worker\ConversationRebuildDataWorker::class, 0);
-        $event->register(\wcf\system\worker\ConversationMessageSearchIndexRebuildDataWorker::class, 300);
-    });
+    $eventHandler->register(
+        \wcf\event\worker\RebuildWorkerCollecting::class,
+        static function (\wcf\event\worker\RebuildWorkerCollecting $event) {
+            $event->register(\wcf\system\worker\ConversationMessageRebuildDataWorker::class, -5);
+            $event->register(\wcf\system\worker\ConversationRebuildDataWorker::class, 0);
+            $event->register(\wcf\system\worker\ConversationMessageSearchIndexRebuildDataWorker::class, 300);
+        }
+    );

 };
 };

diff --git a/userGroupOption.xml b/userGroupOption.xml
index 08e3f19a6d882611dc38ae6136f2612d77b14409..dfe7695493dc742d29dfac3b2b5115e09f5dc5fd 100644 (file)
--- a/userGroupOption.xml
+++ b/userGroupOption.xml
@@ -43,14 +43,16 @@
                        <option name="user.conversation.canReplyToConversation">
                                <categoryname>user.conversation</categoryname>
                                <optiontype>boolean</optiontype>
                        <option name="user.conversation.canReplyToConversation">
                                <categoryname>user.conversation</categoryname>
                                <optiontype>boolean</optiontype>

-                               <defaultvalue>1</defaultvalue>
+                               <defaultvalue>0</defaultvalue>

                                <usersonly>1</usersonly>
                                <usersonly>1</usersonly>

+                               <userdefaultvalue>1</userdefaultvalue>

                        </option>
                        <option name="user.conversation.canStartConversation">
                                <categoryname>user.conversation</categoryname>
                                <optiontype>boolean</optiontype>
                        </option>
                        <option name="user.conversation.canStartConversation">
                                <categoryname>user.conversation</categoryname>
                                <optiontype>boolean</optiontype>

-                               <defaultvalue>1</defaultvalue>
+                               <defaultvalue>0</defaultvalue>

                                <usersonly>1</usersonly>
                                <usersonly>1</usersonly>

+                               <userdefaultvalue>1</userdefaultvalue>

                        </option>
                        <option name="user.conversation.canEditMessage">
                                <categoryname>user.conversation</categoryname>
                        </option>
                        <option name="user.conversation.canEditMessage">
                                <categoryname>user.conversation</categoryname>