mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-17 12:10:45 +02:00
Code Issues Releases Wiki Activity

Minor adjustments in MarkupFieldtype class

Browse Source
This commit is contained in:
Ryan Cramer
2023-05-03 11:07:00 -04:00
parent 9bfce99352
commit a9b656c45e
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wire/core/MarkupFieldtype.php
View File

@@ -80,6 +80,7 @@ class MarkupFieldtype extends WireData implements Module {
* *
*/ */
public function __construct(Page $page = null, Field $field = null, $value = null) { public function __construct(Page $page = null, Field $field = null, $value = null) {
parent::__construct();
if($page) $this->setPage($page); if($page) $this->setPage($page);
if($field) $this->setField($field); if($field) $this->setField($field);
if(!is_null($value)) $this->setValue($value); if(!is_null($value)) $this->setValue($value);
@@ -112,7 +113,7 @@ class MarkupFieldtype extends WireData implements Module {
$valid = false; $valid = false;
if($value instanceof PageArray) { if($value instanceof PageArray) {
// PageArray object: get array of property value from each item // PageArray object: get array of property value from each item
$field = $this->wire('fields')->get($property); $field = $this->wire()->fields->get($property);
if(is_object($field) && $field->type) { if(is_object($field) && $field->type) {
$a = array(); $a = array();
foreach($value as $page) { foreach($value as $page) {
@@ -139,14 +140,13 @@ class MarkupFieldtype extends WireData implements Module {
// Page object // Page object
$page = $value; $page = $value;
$value = $page->getFormatted($property); $value = $page->getFormatted($property);
$field = $this->wire('fields')->get($property); $field = $this->wire()->fields->get($property);
if(is_object($field) && $field->type) return $field->type->markupValue($page, $field, $value); if(is_object($field) && $field->type) return $field->type->markupValue($page, $field, $value);
$valid = true; $valid = true;
} else if($value instanceof LanguagesValueInterface) { } else if($value instanceof LanguagesValueInterface) {
/** @var LanguagesValueInterface $value */ /** @var LanguagesValueInterface $value */
/** @var Languages $languages */ /** @var Languages $languages */
$languages = $this->wire('languages'); $languages = $this->wire()->languages;
if($property) {
if($property === 'data') { if($property === 'data') {
$languageID = $languages->getDefault()->id; $languageID = $languages->getDefault()->id;
} else if(is_string($property) && preg_match('/^data(\d+)$/', $property, $matches)) { } else if(is_string($property) && preg_match('/^data(\d+)$/', $property, $matches)) {
@@ -155,9 +155,6 @@ class MarkupFieldtype extends WireData implements Module {
$languageID = 0; $languageID = 0;
} }
$value = $languageID ? $value->getLanguageValue($languageID) : (string) $value; $value = $languageID ? $value->getLanguageValue($languageID) : (string) $value;
} else {
$value = (string) $value;
}
} else if($value instanceof WireData) { } else if($value instanceof WireData) {
// WireData object // WireData object
@@ -268,14 +265,14 @@ class MarkupFieldtype extends WireData implements Module {
* *
*/ */
protected function valueToString($value, $encode = true) { protected function valueToString($value, $encode = true) {
if(is_object($value) && ($value instanceof Pagefiles || $value instanceof Pagefile)) { if($value instanceof Pagefiles || $value instanceof Pagefile) {
return $this->objectToString($value); return $this->objectToString($value);
} else if(WireArray::iterable($value)) { } else if(WireArray::iterable($value)) {
return $this->arrayToString($value); return $this->arrayToString($value);
} else if(is_object($value)) { } else if(is_object($value)) {
return $this->objectToString($value); return $this->objectToString($value);
} else { } else {
return $encode ? $this->wire('sanitizer')->entities1($value) : $value; return $encode ? $this->wire()->sanitizer->entities1($value) : $value;
} }
} }
@@ -392,7 +389,7 @@ class MarkupFieldtype extends WireData implements Module {
public function setPage(Page $page) { $this->_page = $page; } public function setPage(Page $page) { $this->_page = $page; }
public function setField(Field $field) { $this->_field = $field; } public function setField(Field $field) { $this->_field = $field; }
public function getPage() { return $this->_page ? $this->_page : $this->wire('pages')->newNullPage(); } public function getPage() { return $this->_page ? $this->_page : $this->wire()->pages->newNullPage(); }
public function getField() { return $this->_field; } public function getField() { return $this->_field; }
/** /**