ExpressionEngine · Yulyaswan · Apr 1, 2026 · Apr 1, 2026 · Apr 2, 2026 · Apr 2, 2026
diff --git a/system/ee/ExpressionEngine/Addons/fluid_field/views/field.php b/system/ee/ExpressionEngine/Addons/fluid_field/views/field.php
@@ -1,4 +1,9 @@
-<div class="fluid__item <?php if ($reorderable): ?>fluid__item--reorderable<?php endif ?>" data-field-name="<?=$field_name?>" data-field-type="<?=$field->getType()?>">
+<?php
+    $fluid_field_id = isset($fluid_field_id) ? (string) $fluid_field_id : '';
+    $fluid_data_id = $field->getItem('fluid_field_data_id');
+    $fluid_data_id = is_null($fluid_data_id) ? '' : (string) $fluid_data_id;
+?>
+<div class="fluid__item <?php if ($reorderable): ?>fluid__item--reorderable<?php endif ?>" data-field-name="<?=$field_name?>" data-field-type="<?=$field->getType()?>" data-fluid-id="<?=$fluid_field_id?>" data-field-id="<?=$field->getId()?>" data-fluid-data-id="<?=htmlspecialchars($fluid_data_id, ENT_QUOTES, 'UTF-8')?>">
     <div class="fluid__item-content">
         <div class="fluid__item-fieldset ">
 

diff --git a/system/ee/ExpressionEngine/Addons/fluid_field/views/fieldgroup.php b/system/ee/ExpressionEngine/Addons/fluid_field/views/fieldgroup.php
@@ -1,4 +1,20 @@
-<div class="fluid__item <?php if ($reorderable) : ?>fluid__item--reorderable<?php endif ?>" data-field-name="<?= $field_group->short_name ?>" data-field-type="field_group">
+<?php
+    $fluid_field_id = isset($fluid_field_id) ? (string) $fluid_field_id : '';
+    $field_ids = [];
+    $fluid_data_ids = [];
+
+    foreach ($field_group_fields as $field) {
+        $field_ids[] = (string) $field->getId();
+        $fluid_data_id = $field->getItem('fluid_field_data_id');
+        if (!is_null($fluid_data_id) && $fluid_data_id !== '') {
+            $fluid_data_ids[] = (string) $fluid_data_id;
+        }
+    }
+
+    $field_id_list = implode(',', array_unique($field_ids));
+    $fluid_data_id_list = implode(',', array_unique($fluid_data_ids));
+?>
+<div class="fluid__item <?php if ($reorderable) : ?>fluid__item--reorderable<?php endif ?>" data-field-name="<?= $field_group->short_name ?>" data-field-type="field_group" data-fluid-id="<?= $fluid_field_id ?>" data-field-id="<?= htmlspecialchars($field_id_list, ENT_QUOTES, 'UTF-8') ?>" data-fluid-data-id="<?= htmlspecialchars($fluid_data_id_list, ENT_QUOTES, 'UTF-8') ?>">
     <div class="fluid__item-content">
         <div class="fluid__item-fieldset ">
 

diff --git a/system/ee/ExpressionEngine/Addons/pro/Service/FrontEdit/FrontEdit.php b/system/ee/ExpressionEngine/Addons/pro/Service/FrontEdit/FrontEdit.php
@@ -27,14 +27,48 @@ public function validateField($field, $data)
      * @param string $field_id_or_name Field ID or short name of the field is not custom
      */
     public function entryFieldEditLink($site_id, $channel_id, $entry_id, $field_id_or_name)
+    {
+        return $this->entryFieldEditLinkWithParams($site_id, $channel_id, $entry_id, $field_id_or_name);
+    }
+
+    /**
+     * Get edit link for entry field with optional extra params
+     *
+     * @param int $site_id Site id
+     * @param int $channel_id Channel id
+     * @param int $entry_id Entry id
+     * @param string $field_id_or_name Field ID or short name of the field is not custom
+     * @param array $extra Optional params to include in frontedit_link token
+     */
+    public function entryFieldEditLinkWithParams($site_id, $channel_id, $entry_id, $field_id_or_name, array $extra = [])
     {
         if ($this->fronteditIsDisabled()) {
             return '';
         }
         if (!is_numeric($site_id) || !is_numeric($channel_id) || !is_numeric($entry_id)) {
             return '';
         }
-        return '{frontedit_link site_id=@' . $site_id . '@ channel_id=@' . $channel_id . '@ entry_id=@' . $entry_id . '@ field_id=@' . $field_id_or_name . '@}';
+
+        $params = [
+            'site_id' => $site_id,
+            'channel_id' => $channel_id,
+            'entry_id' => $entry_id,
+            'field_id' => $field_id_or_name,
+        ];
+
+        foreach ($extra as $key => $value) {
+            if ($value === null || $value === '') {
+                continue;
+            }
+            $params[$key] = $value;
+        }
+
+        $parts = [];
+        foreach ($params as $key => $value) {
+            $parts[] = $key . '=@' . (string) $value . '@';
+        }
+
+        return '{frontedit_link ' . implode(' ', $parts) . '}';
     }
 
     /**
@@ -296,15 +330,15 @@ public function loadFrontEditAssets($output)
                     . $elementId
                     . '" data-editableurl="'
                     . $fieldEditUrl
-                    . '" data-entry_id="ENTRY_ID" data-site_id="SITE_ID" data-size="WINDOW_SIZE" title="FIELD_NAME">'
+                    . 'EDITABLE_URL_EXTRA" data-entry_id="ENTRY_ID" data-site_id="SITE_ID" data-size="WINDOW_SIZE"FLUID_ITEM_FIELD_ID_ATTRFLUID_ITEM_DATA_ID_ATTR title="FIELD_NAME">'
                     . '<img src="' . $pencilUrl . '" width="24px" height="24px" alt="' . $altText . '" style="cursor:pointer !important; filter: drop-shadow(0 1px 3px rgba(0,0,0,.20)) !important; vertical-align: bottom !important; border-radius: 0 !important; width: unset !important;" />'
                     . '</span>';
         $frontEditPermission = [];
         $entry_data = [];
         if (preg_match_all("/{\s*frontedit_link\s+.*\}/sU", $output, $tags)) {
             foreach ($tags[0] as $tag) {
                 $replace = [];
-                if (preg_match_all("/([a-zA-Z]+(?:_id|_name|lass)*)=[\"\'@]([a-zA-Z0-9_-]+)[\"\'@]/s", $tag, $params)) {
+                if (preg_match_all("/([a-zA-Z][a-zA-Z0-9_]*)=[\"\'@]([^\"\'@}]*)[\"\'@]/s", $tag, $params)) {
                     $replace['class'] = '';
                     foreach ($params[1] as $i => $key) {
                         $replace[$key] = $params[2][$i];
@@ -344,9 +378,23 @@ public function loadFrontEditAssets($output)
                         }
 
                         $keyGen = $this->randomKeyGen();
+                        $editableUrlExtra = '';
+                        $fluidItemFieldIdAttr = '';
+                        $fluidItemDataIdAttr = '';
+
+                        if (isset($replace['fluid_item_field_id']) && $replace['fluid_item_field_id'] !== '') {
+                            $editableUrlExtra .= '&amp;fluid_item_field_id=' . rawurlencode($replace['fluid_item_field_id']);
+                            $fluidItemFieldIdAttr = ' data-fluid_item_field_id="' . htmlspecialchars($replace['fluid_item_field_id'], ENT_QUOTES, 'UTF-8') . '"';
+                        }
+
+                        if (isset($replace['fluid_item_data_id']) && $replace['fluid_item_data_id'] !== '') {
+                            $editableUrlExtra .= '&amp;fluid_item_data_id=' . rawurlencode($replace['fluid_item_data_id']);
+                            $fluidItemDataIdAttr = ' data-fluid_item_data_id="' . htmlspecialchars($replace['fluid_item_data_id'], ENT_QUOTES, 'UTF-8') . '"';
+                        }
+
                         $editLink = str_replace(
-                            ['SITE_ID', 'CHANNEL_ID', 'ENTRY_ID', 'FIELD_ID', 'KEYGEN', 'FIELD_NAME', 'WINDOW_SIZE', 'MARKER_CLASS'],
-                            [$replace['site_id'], $replace['channel_id'], $replace['entry_id'], $replace['field_id'], $keyGen, $fieldName, $windowSize, $replace['class']],
+                            ['SITE_ID', 'CHANNEL_ID', 'ENTRY_ID', 'FIELD_ID', 'KEYGEN', 'FIELD_NAME', 'WINDOW_SIZE', 'MARKER_CLASS', 'EDITABLE_URL_EXTRA', 'FLUID_ITEM_FIELD_ID_ATTR', 'FLUID_ITEM_DATA_ID_ATTR'],
+                            [$replace['site_id'], $replace['channel_id'], $replace['entry_id'], $replace['field_id'], $keyGen, $fieldName, $windowSize, $replace['class'], $editableUrlExtra, $fluidItemFieldIdAttr, $fluidItemDataIdAttr],
                             $element
                         );
                     } else {

diff --git a/...ee/ExpressionEngine/Tests/ExpressionEngine/legacy/Libraries/CustomFieldPairParserTest.php b/...ee/ExpressionEngine/Tests/ExpressionEngine/legacy/Libraries/CustomFieldPairParserTest.php
@@ -0,0 +1,191 @@
+<?php
+
+namespace {
+    require_once __DIR__ . '/../../../eeObjectMock.php';
+    require_once SYSPATH . 'ee/legacy/libraries/channel_entries_parser/Parser.php';
+
+    if (!interface_exists('EE_Channel_parser_component', false)) {
+        interface EE_Channel_parser_component
+        {
+            public function disabled(array $disabled, \EE_Channel_preparser $pre);
+            public function pre_process($tagdata, \EE_Channel_preparser $pre);
+            public function replace($tagdata, \EE_Channel_data_parser $obj, $preparse_data);
+        }
+    }
+
+    require_once SYSPATH . 'ee/legacy/libraries/channel_entries_parser/components/Custom_field_pair.php';
+}
+
+namespace ExpressionEngine\Tests\ExpressionEngine\legacy\Libraries {
+    use PHPUnit\Framework\TestCase;
+
+    class CustomFieldPairDataParserStub extends \EE_Channel_data_parser
+    {
+        private $row;
+        private $prefix;
+        private $channel;
+        private $preparsed;
+
+        public function __construct(array $row, string $prefix, object $channel, object $preparsed)
+        {
+            $this->row = $row;
+            $this->prefix = $prefix;
+            $this->channel = $channel;
+            $this->preparsed = $preparsed;
+        }
+
+        public function row()
+        {
+            return $this->row;
+        }
+
+        public function prefix()
+        {
+            return $this->prefix;
+        }
+
+        public function channel()
+        {
+            return $this->channel;
+        }
+
+        public function preparsed()
+        {
+            return $this->preparsed;
+        }
+    }
+
+    class CustomFieldPairParserTest extends TestCase
+    {
+        protected function tearDown(): void
+        {
+            ee()->resetMocks();
+        }
+
+        public function testReplaceUsesStableFluidDetectionWhenFieldTypeMutatesDuringNestedParse(): void
+        {
+            $fieldType = new class(11) {
+                private $fieldId;
+                public $disable_frontedit = false;
+
+                public function __construct(int $fieldId)
+                {
+                    $this->fieldId = $fieldId;
+                }
+
+                public function _init(array $config)
+                {
+                }
+
+                public function id()
+                {
+                    return $this->fieldId;
+                }
+
+                public function replace_tag($data, $params = [], $tagdata = '')
+                {
+                    return $tagdata;
+                }
+            };
+
+            $apiChannelFields = new class($fieldType) {
+                public $field_type = 'fluid_field';
+                public $ft_paths = ['fluid_field' => '/tmp'];
+
+                private $fieldType;
+
+                public function __construct($fieldType)
+                {
+                    $this->fieldType = $fieldType;
+                }
+
+                public function setup_handler($fieldId, $strict = true)
+                {
+                    $this->field_type = 'fluid_field';
+                    return $this->fieldType;
+                }
+
+                public function apply($method, array $args)
+                {
+                    if ($method === 'pre_process') {
+                        return $args[0];
+                    }
+
+                    if ($method === 'replace_tag') {
+                        // Simulate nested parsing mutating API state away from fluid_field.
+                        $this->field_type = 'text';
+                        return $args[2];
+                    }
+
+                    return '';
+                }
+            };
+
+            $frontEdit = new class {
+                public $calls = 0;
+
+                public function entryFieldEditLink($siteId, $channelId, $entryId, $fieldId)
+                {
+                    $this->calls++;
+                    return '{frontedit_link}';
+                }
+            };
+
+            ee()->setMock('api_channel_fields', $apiChannelFields);
+            ee()->setMock('pro:FrontEdit', $frontEdit);
+            ee()->setMock('load', new class {
+                public function add_package_path($path, $viewCascading = true)
+                {
+                }
+
+                public function remove_package_path($path)
+                {
+                }
+            });
+            ee()->setMock('extensions', new class {
+                public function active_hook($name)
+                {
+                    return false;
+                }
+            });
+
+            $channel = (object) [
+                'cfields' => [
+                    1 => ['fluid_field' => 11],
+                ],
+                'hidden_fields' => [],
+            ];
+
+            $dataParser = new CustomFieldPairDataParserStub(
+                [
+                    'site_id' => 1,
+                    'channel_id' => 2,
+                    'entry_id' => 5,
+                    'field_id_11' => 'value',
+                ],
+                '',
+                $channel,
+                new class {
+                    public function set_once_data($component, $data)
+                    {
+                    }
+                }
+            );
+
+            $chunk = '{fluid_field}Body {fluid_field:frontedit}{/fluid_field}';
+            $tagdata = '{fluid_field:frontedit}' . $chunk;
+            $pfieldChunks = [
+                1 => [
+                    'fluid_field' => [
+                        ['', 'Body {fluid_field:frontedit}', [], $chunk],
+                    ],
+                ],
+            ];
+
+            $result = (new \EE_Channel_custom_field_pair_parser())->replace($tagdata, $dataParser, $pfieldChunks);
+
+            $this->assertSame('Body ', $result);
+            $this->assertSame(0, $frontEdit->calls);
+        }
+    }
+}