Merge 22c3928 into 17dc63f

cakemanager · Jan 28, 2020 · 0b0aed8 · 0b0aed8
2 parents 17dc63f + 22c3928
commit 0b0aed8
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/Model/Behavior/WhoDidItBehavior.php b/src/Model/Behavior/WhoDidItBehavior.php
@@ -110,13 +110,21 @@ public function initialize(array $config)
     public function beforeFind($event, $query, $options, $primary)
     {
         $contain = $query->getContain();
-        if ($this->getConfig('contain') || isset($contain['CreatedBy']) || isset($contain['ModifiedBy'])) {
+        $fields = $this->getConfig('fields');
+        if ($this->getConfig('contain') || isset($contain['CreatedBy'])) {
             if ($this->getConfig('created_by')) {
-                $query->contain(['CreatedBy' => ['fields' => $this->getConfig('fields')]]);
+                if (isset($contain['CreatedBy']['fields'])) {
+                    $fields = $contain['CreatedBy']['fields'];
+                }
+                $query->contain(['CreatedBy' => ['fields' => $fields]]);
             }
-
+        }
+        if ($this->getConfig('contain') || isset($contain['ModifiedBy'])) {
             if ($this->getConfig('modified_by')) {
-                $query->contain(['ModifiedBy' => ['fields' => $this->getConfig('fields')]]);
+                if (isset($contain['ModifiedBy']['fields'])) {
+                    $fields = $contain['ModifiedBy']['fields'];
+                }
+                $query->contain(['ModifiedBy' => ['fields' => $fields]]);
             }
         }
     }