mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-24 15:23:11 +02:00
Code Issues Releases Wiki Activity

Fix issue in MarkupFieldtype when rendering file/image fields within repeater items

Browse Source
This commit is contained in:
Ryan Cramer
2018-04-13 08:50:02 -04:00
parent 6b3b0b7782
commit 5884f05b9f
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wire/core/MarkupFieldtype.php
View File

@@ -102,7 +102,17 @@ class MarkupFieldtype extends WireData implements Module {
$valid = false;
if($value instanceof PageArray) {
// PageArray object: get array of property value from each item
$value = $value->explode($property, array('getMethod' => 'getFormatted'));
$field = $this->wire('fields')->get($property);
if(is_object($field) && $field->type) {
$a = array();
foreach($value as $page) {
$v = $page->getFormatted($property);
$a[] = $field->type->markupValue($page, $field, $v);
}
return $this->valueToString($a);
} else {
$value = $value->explode($property, array('getMethod' => 'getFormatted'));
}
$valid = true;
} else if($value instanceof WireArray) {
@@ -118,7 +128,7 @@ class MarkupFieldtype extends WireData implements Module {
if(is_object($field) && $field->type) return $field->type->markupValue($page, $field, $value);
$valid = true;
} else if($value instanceof LanguagesValueInterface) {
/** @var LanguaagesValueInterface $value */
/** @var LanguagesValueInterface $value */
/** @var Languages $languages */
$languages = $this->wire('languages');
if($property) {
@@ -126,8 +136,10 @@ class MarkupFieldtype extends WireData implements Module {
$languageID = $languages->getDefault()->id;
} else if(is_string($property) && preg_match('/^data(\d+)$/', $property, $matches)) {
$languageID = (int) $matches[1];
} else {
$languageID = 0;
}
$value = $value->getLanguageValue($languageID);
$value = $languageID ? $value->getLanguageValue($languageID) : (string) $value;
} else {
$value = (string) $value;
}