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

Fix issue processwire/processwire-issues#1359 plus some additional Page class optimization

Browse Source
This commit is contained in:
Ryan Cramer
2021-03-29 10:14:12 -04:00
parent f98d25b83c
commit e68f4c2de6
1 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
wire/core/Page.php
View File

@@ -967,7 +967,7 @@ class Page extends WireData implements \Countable, WireMatchable {
public function get($key) { public function get($key) {
// if lazy load pending, load the page now // if lazy load pending, load the page now
if(is_int($this->lazyLoad) && $this->lazyLoad && $key != 'id') $this->_lazy(true); if($this->lazyLoad && $key !== 'id' && is_int($this->lazyLoad)) $this->_lazy(true);
if(is_array($key)) $key = implode('|', $key); if(is_array($key)) $key = implode('|', $key);
if(isset(PageProperties::$basePropertiesAlternates[$key])) { if(isset(PageProperties::$basePropertiesAlternates[$key])) {
@@ -1041,33 +1041,48 @@ class Page extends WireData implements \Countable, WireMatchable {
default: default:
if($key && isset($this->settings[(string)$key])) return $this->settings[$key]; if($key && isset($this->settings[(string)$key])) return $this->settings[$key];
if($key === 'meta' && !$this->wire('fields')->get('meta')) return $this->meta(); // always WireDataDB if($key === 'meta' && !$this->wire()->fields->get('meta')) return $this->meta(); // always WireDataDB
// populate a formatted string with {tag} vars
if(strpos($key, '{') !== false && strpos($key, '}')) return $this->getMarkup($key);
// populate a markup requested field like '_fieldName_' if(!ctype_alnum("$key")) {
if(strpos($key, '_') === 0 && substr($key, -1) == '_' && !$this->wire('fields')->get($key)) { // populate a formatted string with {tag} vars
if($this->wire('sanitizer')->fieldName($key) == $key) return $this->renderField(substr($key, 1, -1)); if(strpos($key, '{') !== false && strpos($key, '}')) return $this->getMarkup($key);
}
if(($value = $this->getFieldFirstValue($key)) !== null) return $value; // populate a markup requested field like '_fieldName_'
if(($value = $this->getFieldValue($key)) !== null) return $value; $ulpos = strpos($key, '_');
if($ulpos === 0 && substr($key, -1) === '_' && !$this->wire()->fields->get($key)) {
// if there is a selector, we'll assume they are using the get() method to get a child if($this->wire()->sanitizer->fieldName($key) == $key) return $this->renderField(substr($key, 1, -1));
if(Selectors::stringHasOperator($key)) return $this->child($key); }
// check if it's a field.subfield property if(strpos($key, '|') !== false) {
if(strpos($key, '.') && ($value = $this->getFieldSubfieldValue($key)) !== null) return $value; $value = $this->getFieldFirstValue($key);
if($value !== null) return $value;
if(strpos($key, '_OR_')) { }
// convert '_OR_' to '|'
$value = $this->getFieldFirstValue(str_replace('_OR_', '|', $key)); $value = $this->getFieldValue($key);
if($value !== null) return $value; if($value !== null) return $value;
// if there is a selector, we'll assume they are using the get() method to get a child
if(Selectors::stringHasOperator($key)) return $this->child($key);
// check if it's a field.subfield property
if(strpos($key, '.')) {
$value = $this->getFieldSubfieldValue($key);
if($value !== null) return $value;
}
if($ulpos !== false && strpos($key, '_OR_')) {
// convert '_OR_' to '|'
$value = $this->getFieldFirstValue(str_replace('_OR_', '|', $key));
if($value !== null) return $value;
}
} else {
$value = $this->getFieldValue($key);
if($value !== null) return $value;
} }
// optionally let a hook look at it // optionally let a hook look at it
if($this->wire('hooks')->isHooked('Page::getUnknown()')) $value = $this->getUnknown($key); if($this->wire()->hooks->isHooked('Page::getUnknown()')) {
$value = $this->getUnknown($key);
}
} }
return $value; return $value;
@@ -1173,23 +1188,29 @@ class Page extends WireData implements \Countable, WireMatchable {
// allow limited access to field.subfield properties when output formatting is on // allow limited access to field.subfield properties when output formatting is on
// we only allow known custom fields, and only 1 level of subfield // we only allow known custom fields, and only 1 level of subfield
$keys = explode('.', $key); list($key1, $key2) = explode('.', $key, 2);
$key1 = $keys[0];
$key2 = $keys[1];
$field = $this->getField($key1);
if(!$field || ($field->flags & Field::flagSystem)) return null;
// test if any parts of key can potentially refer to API variables // test if any parts of key can potentially refer to API variables
$api = false; $api = false;
foreach($keys as $k) { foreach(explode('.', $key2) as $k) {
if($this->wire($k)) $api = true; if($this->wire($k)) $api = true;
if($api) break; if($api) break;
} }
if($api) return null; // do not allow dereference of API variables if($api) return null; // do not allow dereference of API variables
if(isset(PageProperties::$traversalReturnTypes[$key1])) {
if(PageProperties::$traversalReturnTypes[$key1] === PageProperties::typePage) {
return $this->$key1()->get($key2);
}
}
$field = $this->getField($key1);
if(!$field || ($field->flags & Field::flagSystem)) return null;
// get first part of value // get first part of value
$value = $this->get($key1); $value = $this->get($key1);
if($value === null) return null;
// then get second part of value // then get second part of value
if($value instanceof WireData) { if($value instanceof WireData) {