fix(revision): fix included properties and properties options

charcoalphp · Nov 8, 2022 · ff0bd59 · ff0bd59
1 parent d9e0346
commit ff0bd59
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/object/src/Charcoal/Object/RevisionService.php b/packages/object/src/Charcoal/Object/RevisionService.php
@@ -53,15 +53,15 @@ public function parseRevisionProperties(ModelInterface $model): array
         $properties = array_keys($model->data());
 
         if ($modelConfig->hasProperties()) {
-            return array_intersect_key($properties, $modelConfig->getProperties());
+            return array_intersect($properties, $modelConfig->getProperties());
         }
 
         if ($modelConfig->hasExcludedProperties()) {
             $excludedProperties = $modelConfig->getExcludedProperties();
 
             if ($modelConfig->hasIncludedProperties()) {
                 $includedProperties = $modelConfig->getIncludedProperties();
-                $excludedProperties = array_filter($excludedProperties, fn($e) => in_array($e, $includedProperties));
+                $excludedProperties = array_filter($excludedProperties, fn($e) => !in_array($e, $includedProperties));
             }
 
             return array_filter(