The active page must be a multiple selection so that an “or” condition is possible.

Author: Cyperghost

wcfsetup/install/files/lib/system/condition/type/request/ActivePageRequestConditionType.class.php

@@ -6,7 +6,7 @@
 use wcf\system\condition\type\AbstractConditionType;
 use wcf\system\condition\type\IContextualConditionType;
 use wcf\system\condition\type\IMigrateConditionType;
-use wcf\system\form\builder\field\SingleSelectionFormField;
+use wcf\system\form\builder\field\MultipleSelectionFormField;
 use wcf\system\request\RequestHandler;
 
 /**
@@ -15,8 +15,8 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @implements IContextualConditionType<string>
- * @extends AbstractConditionType<string>
+ * @implements IContextualConditionType<string[]>
+ * @extends AbstractConditionType<string[]>
  */
 final class ActivePageRequestConditionType extends AbstractConditionType implements IContextualConditionType, IMigrateConditionType
 {
@@ -33,19 +33,18 @@ public function getLabel(): string
     }
 
     #[\Override]
-    public function getFormField(string $id): SingleSelectionFormField
+    public function getFormField(string $id): MultipleSelectionFormField
     {
-        // SelectFormField stores its value as a string,
-        // so we need to convert it to an integer in the `matches` method.
-        return SingleSelectionFormField::create($id)
+        return MultipleSelectionFormField::create($id)
             ->options((new PageNodeTree())->getNodeList(), true)
+            ->filterable()
             ->required();
     }
 
     #[\Override]
     public function matches(): bool
     {
-        return RequestHandler::getInstance()->getActivePageID() === (int)$this->filter;
+        return \in_array(RequestHandler::getInstance()->getActivePageID(), $this->filter);
     }
 
     #[\Override]
@@ -54,18 +53,15 @@ public function migrateConditionData(array &$conditionData): array
         $reverseLogic = $conditionData['pageIDs_reverseLogic'] ?? false;
         $pageIDs = $conditionData['pageIDs'] ?? [];
 
-        if ($reverseLogic || \count($pageIDs) > 1) {
+        if ($reverseLogic) {
             // `NotOnPageRequestConditionType` should migrate the data.
             return [];
         }
 
-        $conditions = [];
-        foreach ($pageIDs as $pageID) {
-            $conditions[] = [
-                'identifier' => $this->getIdentifier(),
-                'value' => (string)$pageID,
-            ];
-        }
+        $conditions[] = [
+            'identifier' => $this->getIdentifier(),
+            'value' => \array_map('strval', $pageIDs),
+        ];
 
         unset($conditionData['pageIDs'], $conditionData['pageIDs_reverseLogic']);
 

wcfsetup/install/files/lib/system/condition/type/request/NotOnPageRequestConditionType.class.php

@@ -55,18 +55,12 @@ public function migrateConditionData(array &$conditionData): array
         $reverseLogic = $conditionData['pageIDs_reverseLogic'] ?? false;
         $pageIDs = $conditionData['pageIDs'] ?? [];
 
-        if (!$reverseLogic && \count($pageIDs) <= 1) {
+        if (!$reverseLogic) {
             // `ActivePageRequestConditionType` should migrate the data.
             return [];
         }
 
         $conditions = [];
-        if (!$reverseLogic) {
-            // If reverse logic is not activated, we must add all unselected pages.
-            // This allows us to turn an “or” condition into an “and” condition.
-            $pageIDs = \array_diff($this->getPageIDs(), $pageIDs);
-        }
-
         foreach ($pageIDs as $pageID) {
             $conditions[] = [
                 'identifier' => $this->getIdentifier(),

wcfsetup/install/files/lib/system/form/builder/container/condition/ConditionFormContainer.class.php

@@ -112,10 +112,10 @@ private function appendCondition(string $identifier, int $index): FormContainer
                 static function (IFormDocument $document, array $parameters) use ($prefixId, $identifier, $fieldId) {
                     $conditions = isset($parameters['data'][$prefixId]) ? JSON::decode($parameters['data'][$prefixId]) : [];
 
-                    if (isset($parameters['data'][$fieldId])) {
+                    if (isset($parameters['data'][$fieldId]) || isset($parameters[$fieldId])) {
                         $conditions[] = [
                             "identifier" => $identifier,
-                            "value" => $parameters['data'][$fieldId],
+                            "value" => $parameters['data'][$fieldId] ?? $parameters[$fieldId],
                         ];
                     }