Skip to content

Commit 570991c

Browse files
authored
Merge pull request #217 from ridho-laksono-lamudi/bugfix/avoid-member-state-for-repeater-field
avoid member state being set on repeater field
2 parents bc2c16e + 7807985 commit 570991c

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/Storage/Legacy.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ public function getContentObject($contenttype, $values = [], $isRootType = true)
1717
$prop = $reflection->getParentClass()->getProperty('app');
1818
$prop->setAccessible(true);
1919
$app = $prop->getValue($this);
20-
$this->localeValues = $values;
21-
20+
2221
$localeSlug = $app['translate.slug'];
2322
if (isset($values[$localeSlug . 'data'])) {
2423
$localeData = json_decode($values[$localeSlug . 'data'], true);
@@ -45,8 +44,8 @@ public function getContentObject($contenttype, $values = [], $isRootType = true)
4544
} else {
4645
$content = new Content($app, $contenttype, $values);
4746
}
48-
49-
$content['originalValues'] = $this->localeValues;
47+
48+
$content['originalValues'] = $values;
5049
return $content;
5150
}
5251

@@ -77,8 +76,8 @@ private function repeaterHydrate($record, $app)
7776
$contentTypeName = $record->contenttype['slug'];
7877

7978
$contentType = $app['config']->get('contenttypes/' . $contentTypeName);
80-
81-
$values = $this->localeValues;
79+
80+
$values = $record;
8281
$localeSlug = $app['translate.slug'];
8382

8483
if (isset($values[$localeSlug . 'data'])) {
@@ -114,7 +113,7 @@ private function repeaterHydrate($record, $app)
114113
}
115114
}
116115

117-
/**
116+
/**
118117
*Fix for field type blocks
119118
*/
120119
if (isset($contentType['fields'][$key]) && $contentType['fields'][$key]['type'] === 'block' && $value !== null) {

0 commit comments

Comments
 (0)