Merge pull request #17 from smg6511/fix-prehook-inclusion

Fix adding prehooks in manager component
Sterc · Dec 1, 2021 · 0430c7c · 0430c7c
2 parents 6e3d16e + 83a7623
commit 0430c7c
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...mponents/formalicious/model/formalicious/snippets/formalicioussnippetrenderform.class.php b/...mponents/formalicious/model/formalicious/snippets/formalicioussnippetrenderform.class.php
@@ -130,6 +130,14 @@ public function run(array $properties = [])
                     $currentStepIndex++;
                 }
 
+                $formPrehooks = explode(',', trim($form->get('prehooks')));
+                $formPrehooks = !empty($formPrehooks) ? array_map('trim', $formPrehooks) : $formPrehooks ;
+
+                $scriptPrehooks = explode(',', trim($this->getProperty('preHooks')));
+                $scriptPrehooks = !empty($scriptPrehooks) ? array_map('trim', $scriptPrehooks) : $scriptPrehooks ;
+
+                $prehooks = array_filter(array_merge($formPrehooks, $scriptPrehooks));
+
                 if ($form->get('posthooks')) {
                     $hooks = array_merge(
                         array_filter(explode(',', $this->getProperty('hooks'))),
@@ -208,7 +216,7 @@ public function run(array $properties = [])
                 }
 
                 $parameters['hooks'] = $this->parseHooks($hooks);
-                $parameters['preHooks'] = $this->parseHooks($this->getProperty('preHooks'));
+                $parameters['preHooks'] = $this->parseHooks($prehooks);
                 $parameters['renderHooks'] = $this->parseHooks($this->getProperty('renderHooks'));
                 $parameters['validate'] = $this->parseValidation($validation);