Update Fields.php

Added onCustomFieldsBeforeSave to onContentAfterSave
joomla · Sep 11, 2023 · e105c62 · e105c62
1 parent 05a331f
commit e105c62
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/plugins/system/fields/src/Extension/Fields.php b/plugins/system/fields/src/Extension/Fields.php
@@ -139,7 +139,7 @@ public function onContentAfterSave($context, $item, $isNew, $data = []): void
         foreach ($fields as $field) {
             // Empty fields that are hidden so that their values will be removed if they exist
             $showOn = $field->params->get('showon', '');
-            if (!empty($showOn) && FieldsHelper::matchShowon($showOn, $fields)) {
+            if (!empty($showOn) && !FieldsHelper::matchShowon($showOn, $fields)) {
                 // Remove value from database
                 $model->setFieldValue($field->id, $item->id, null);
                 continue;
@@ -163,8 +163,11 @@ public function onContentAfterSave($context, $item, $isNew, $data = []): void
                 $value = json_encode($value);
             }
 
+            $field->rawvalue = $value;
+            Factory::getApplication()->triggerEvent('onCustomFieldsBeforeSave', [&$field]);
+
             // Setting the value for the field and the item
-            $model->setFieldValue($field->id, $item->id, $value);
+            $model->setFieldValue($field->id, $item->id, $field->rawvalue);
         }
     }