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

Various minor optimizations to Page class and its helper classes

Browse Source
This commit is contained in:
Ryan Cramer
2021-07-02 12:32:04 -04:00
parent 4aebc4a203
commit 4167f17235
4 changed files with 301 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

280
wire/core/Page.php
View File

@@ -591,7 +591,7 @@ class Page extends WireData implements \Countable, WireMatchable {
*/ */
public function __construct(Template $tpl = null) { public function __construct(Template $tpl = null) {
if(!is_null($tpl)) { if($tpl !== null) {
$tpl->wire($this); $tpl->wire($this);
$this->template = $tpl; $this->template = $tpl;
} }
@@ -624,18 +624,21 @@ class Page extends WireData implements \Countable, WireMatchable {
$this->filesManager->setPage($this); $this->filesManager->setPage($this);
} }
$this->_meta = null; $this->_meta = null;
foreach($this->template->fieldgroup as $field) { $template = $this->template();
$name = $field->name; if($template) {
if(!$field->type) continue; foreach($template->fieldgroup as $field) {
if(!$field->type->isAutoload() && !isset($this->data[$name])) continue; // important for draft loading $name = $field->name;
$value = $this->get($name); if(!$field->type) continue;
// no need to clone non-objects, as they've already been cloned if(!$field->type->isAutoload() && !isset($this->data[$name])) continue; // important for draft loading
// no need to clone Page objects as we still want to reference the original page $value = $this->get($name);
if(!is_object($value) || $value instanceof Page) continue; // no need to clone non-objects, as they've already been cloned
$value2 = clone $value; // no need to clone Page objects as we still want to reference the original page
$this->set($name, $value2); // commit cloned value if(!is_object($value) || $value instanceof Page) continue;
// if value is Pagefiles, then tell it the new page $value2 = clone $value;
if($value2 instanceof PageFieldValueInterface) $value2->setPage($this); $this->set($name, $value2); // commit cloned value
// if value is Pagefiles, then tell it the new page
if($value2 instanceof PageFieldValueInterface) $value2->setPage($this);
}
} }
$this->instanceID .= ".clone"; $this->instanceID .= ".clone";
if($track) $this->setTrackChanges(true); if($track) $this->setTrackChanges(true);
@@ -717,8 +720,8 @@ class Page extends WireData implements \Countable, WireMatchable {
break; break;
case 'template': case 'template':
case 'templates_id': case 'templates_id':
if($key == 'templates_id' && $this->template && $this->template->id == $value) break; if($key === 'templates_id' && $this->template && $this->template->id == $value) break;
if($key == 'templates_id') $value = $this->wire('templates')->get((int)$value); if($key === 'templates_id') $value = $this->wire()->templates->get((int) $value);
$this->setTemplate($value); $this->setTemplate($value);
break; break;
case 'created': case 'created':
@@ -741,7 +744,8 @@ class Page extends WireData implements \Countable, WireMatchable {
$this->setUser($value, str_replace('User', '', $key)); $this->setUser($value, str_replace('User', '', $key));
break; break;
case 'sortfield': case 'sortfield':
if($this->template && $this->template->sortfield) break; $template = $this->template();
if($template && $template->sortfield) break;
$value = $this->wire()->pages->sortfields()->decode($value); $value = $this->wire()->pages->sortfields()->decode($value);
if($this->isLoaded && $this->settings[$key] != $value) $this->trackChange($key, $this->settings[$key], $value); if($this->isLoaded && $this->settings[$key] != $value) $this->trackChange($key, $this->settings[$key], $value);
$this->settings[$key] = $value; $this->settings[$key] = $value;
@@ -842,7 +846,7 @@ class Page extends WireData implements \Countable, WireMatchable {
*/ */
public function setFieldValue($key, $value, $load = true) { public function setFieldValue($key, $value, $load = true) {
if(!$this->template) { if(!$this->template()) {
throw new WireException("You must assign a template to the page before setting custom field values ($key)"); throw new WireException("You must assign a template to the page before setting custom field values ($key)");
} }
@@ -983,13 +987,13 @@ class Page extends WireData implements \Countable, WireMatchable {
return $this->{$key}(); return $this->{$key}();
} else if($type === 'n') { } else if($type === 'n') {
// local method, possibly overridden by $field // local method, possibly overridden by $field
if(!$this->wire('fields')->get($key)) return $this->{$key}(); if(!$this->wire()->fields->get($key)) return $this->{$key}();
} else if($type === 's') { } else if($type === 's') {
// settings property // settings property
return $this->settings[$key]; return $this->settings[$key];
} else if($type === 't') { } else if($type === 't') {
// map to method in PageTraversal, if not overridden by field // map to method in PageTraversal, if not overridden by field
if(!$this->wire('fields')->get($key)) return $this->traversal()->{$key}($this); if(!$this->wire()->fields->get($key)) return $this->traversal()->{$key}($this);
} else if($type) { } else if($type) {
// defined local method // defined local method
return $this->{$type}(); return $this->{$type}();
@@ -1005,10 +1009,12 @@ class Page extends WireData implements \Countable, WireMatchable {
if(!$value) $value = $this->_parent_id; if(!$value) $value = $this->_parent_id;
break; break;
case 'templates_id': case 'templates_id':
$value = $this->template ? $this->template->id : 0; $template = $this->template();
$value = $template ? $template->id : 0;
break; break;
case 'fieldgroup': case 'fieldgroup':
$value = $this->template ? $this->template->fieldgroup : null; $template = $this->template();
$value = $template ? $template->fieldgroup : null;
break; break;
case 'modifiedUser': case 'modifiedUser':
case 'createdUser': case 'createdUser':
@@ -1017,7 +1023,7 @@ class Page extends WireData implements \Countable, WireMatchable {
break; break;
case 'urlSegment': case 'urlSegment':
// deprecated, but kept for backwards compatibility // deprecated, but kept for backwards compatibility
$value = $this->wire('input')->urlSegment1; $value = $this->wire()->input->urlSegment1;
break; break;
case 'statusStr': case 'statusStr':
$value = implode(' ', $this->status(true)); $value = implode(' ', $this->status(true));
@@ -1026,10 +1032,10 @@ class Page extends WireData implements \Countable, WireMatchable {
case 'createdStr': case 'createdStr':
case 'publishedStr': case 'publishedStr':
$value = $this->settings[str_replace('Str', '', $key)]; $value = $this->settings[str_replace('Str', '', $key)];
$value = $value ? wireDate($this->wire('config')->dateFormat, $value) : ''; $value = $value ? wireDate($this->wire()->config->dateFormat, $value) : '';
break; break;
case 'render': case 'render':
$value = $this->wire('modules')->get('PageRender'); $value = $this->wire()->modules->get('PageRender'); /** @var PageRender $value */
$value->setPropertyPage($this); $value->setPropertyPage($this);
break; break;
case 'loaderCache': case 'loaderCache':
@@ -1101,7 +1107,7 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function getField($field) { public function getField($field) {
$template = $this->template; $template = $this->template();
$fieldgroup = $template ? $template->fieldgroup : null; $fieldgroup = $template ? $template->fieldgroup : null;
if(!$fieldgroup) return null; if(!$fieldgroup) return null;
if($this->outputFormatting && $fieldgroup->hasFieldContext($field)) { if($this->outputFormatting && $fieldgroup->hasFieldContext($field)) {
@@ -1126,10 +1132,11 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function getFields() { public function getFields() {
if(!$this->template) return new FieldsArray(); $template = $this->template();
if(!$template) return new FieldsArray();
$fields = new FieldsArray(); $fields = new FieldsArray();
/** @var Fieldgroup $fieldgroup */ /** @var Fieldgroup $fieldgroup */
$fieldgroup = $this->template->fieldgroup; $fieldgroup = $template->fieldgroup;
foreach($fieldgroup as $field) { foreach($fieldgroup as $field) {
if($fieldgroup->hasFieldContext($field)) { if($fieldgroup->hasFieldContext($field)) {
$field = $fieldgroup->getFieldContext($field); $field = $fieldgroup->getFieldContext($field);
@@ -1153,7 +1160,8 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function hasField($field) { public function hasField($field) {
if(!$this->template) return false; $template = $this->template();
if(!$template) return false;
if(is_string($field) && strpos($field, '|') !== false) { if(is_string($field) && strpos($field, '|') !== false) {
$field = explode('|', $field); $field = explode('|', $field);
} }
@@ -1165,7 +1173,7 @@ class Page extends WireData implements \Countable, WireMatchable {
if($result) break; if($result) break;
} }
} else { } else {
$result = $this->template->fieldgroup->hasField($field); $result = $template->fieldgroup->hasField($field);
} }
return $result; return $result;
} }
@@ -1322,15 +1330,21 @@ class Page extends WireData implements \Countable, WireMatchable {
*/ */
protected function getFieldValue($key, $selector = '') { protected function getFieldValue($key, $selector = '') {
if(!$this->template) return parent::get($key); $template = $this->template();
if(!$template) return parent::get($key);
$field = $this->getField($key); $field = $this->getField($key);
$value = parent::get($key); $value = parent::get($key);
if(!$field) return $value; // likely a runtime field, not part of our data if(!$field) return $value; // likely a runtime field, not part of our data
/** @var Fieldtype $fieldtype */
$fieldtype = $field->type;
$invokeArgument = ''; $invokeArgument = '';
if($value !== null && isset($this->wakeupNameQueue[$key])) { if($value !== null && isset($this->wakeupNameQueue[$key])) {
$value = $field->type->_callHookMethod('wakeupValue', array($this, $field, $value)); $value = $fieldtype->_callHookMethod('wakeupValue', array($this, $field, $value));
$value = $field->type->sanitizeValue($this, $field, $value); $value = $fieldtype->sanitizeValue($this, $field, $value);
$trackChanges = $this->trackChanges(true); $trackChanges = $this->trackChanges(true);
$this->setTrackChanges(false); $this->setTrackChanges(false);
parent::set($key, $value); parent::set($key, $value);
@@ -1349,7 +1363,7 @@ class Page extends WireData implements \Countable, WireMatchable {
// so just return a blank value as defined by the Fieldtype // so just return a blank value as defined by the Fieldtype
// note: we do not store this blank value in the Page, so that // note: we do not store this blank value in the Page, so that
// the real value can potentially be loaded later without output formatting // the real value can potentially be loaded later without output formatting
$value = $field->type->getBlankValue($this, $field); $value = $fieldtype->getBlankValue($this, $field);
return $this->formatFieldValue($field, $value); return $this->formatFieldValue($field, $value);
} }
} }
@@ -1361,7 +1375,8 @@ class Page extends WireData implements \Countable, WireMatchable {
$track = $this->trackChanges(); $track = $this->trackChanges();
$this->setTrackChanges(false); $this->setTrackChanges(false);
if(!$field->type) return null;
if(!$fieldtype) return null;
if($selector && !Selectors::stringHasSelector($selector)) { if($selector && !Selectors::stringHasSelector($selector)) {
// if selector argument provdied, but isn't valid, we assume it // if selector argument provdied, but isn't valid, we assume it
@@ -1371,16 +1386,16 @@ class Page extends WireData implements \Countable, WireMatchable {
} }
if($selector) { if($selector) {
$value = $field->type->loadPageFieldFilter($this, $field, $selector); $value = $fieldtype->loadPageFieldFilter($this, $field, $selector);
} else { } else {
// $value = $field->type->loadPageField($this, $field); // $value = $field->type->loadPageField($this, $field);
$value = $field->type->_callHookMethod('loadPageField', array($this, $field)); $value = $fieldtype->_callHookMethod('loadPageField', array($this, $field));
} }
if($value === null) { if($value === null) {
$value = $field->type->getDefaultValue($this, $field); $value = $fieldtype->getDefaultValue($this, $field);
} else { } else {
$value = $field->type->_callHookMethod('wakeupValue', array($this, $field, $value)); $value = $fieldtype->_callHookMethod('wakeupValue', array($this, $field, $value));
//$value = $field->type->wakeupValue($this, $field, $value); //$value = $field->type->wakeupValue($this, $field, $value);
} }
@@ -1558,7 +1573,7 @@ class Page extends WireData implements \Countable, WireMatchable {
if(!$key) return ''; if(!$key) return '';
} }
if($this->wire('sanitizer')->name($key) != $key) { if($this->wire()->sanitizer->name($key) != $key) {
// not a possible field name // not a possible field name
return ''; return '';
} }
@@ -1978,7 +1993,7 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
protected function setTemplate($tpl) { protected function setTemplate($tpl) {
if(!is_object($tpl)) $tpl = $this->wire('templates')->get($tpl); if(!is_object($tpl)) $tpl = $this->wire()->templates->get($tpl);
if(!$tpl instanceof Template) throw new WireException("Invalid value sent to Page::setTemplate"); if(!$tpl instanceof Template) throw new WireException("Invalid value sent to Page::setTemplate");
if($this->template && $this->template->id != $tpl->id && $this->isLoaded) { if($this->template && $this->template->id != $tpl->id && $this->isLoaded) {
if($this->settings['status'] & Page::statusSystem) { if($this->settings['status'] & Page::statusSystem) {
@@ -1992,6 +2007,18 @@ class Page extends WireData implements \Countable, WireMatchable {
return $this; return $this;
} }
/**
* Get or set template
*
* @param null|Template|string|int $template
* @return Template|null
* @since 3.0.181
*
*/
public function template($template = null) {
if($template !== null) $this->setTemplate($template);
return $this->template;
}
/** /**
* Set this page's parent Page * Set this page's parent Page
@@ -2039,13 +2066,13 @@ class Page extends WireData implements \Countable, WireMatchable {
if(is_object($user)) { if(is_object($user)) {
$user = null; $user = null;
} else { } else {
$user = $this->wire('users')->get($user); $user = $this->wire()->users->get($user);
} }
} }
// if they are setting an invalid user or unknown user, then the Page defaults to the super user // if they are setting an invalid user or unknown user, then the Page defaults to the super user
if(!$user || !$user->id || !$user instanceof User) { if(!$user || !$user->id || !$user instanceof User) {
$user = $this->wire('users')->get($this->wire('config')->superUserPageID); $user = $this->wire()->users->get($this->wire()->config->superUserPageID);
} }
if(strpos($userType, 'created') === 0) { if(strpos($userType, 'created') === 0) {
@@ -2061,6 +2088,7 @@ class Page extends WireData implements \Countable, WireMatchable {
$existingUserID = $this->settings[$field]; $existingUserID = $this->settings[$field];
if($existingUserID != $user->id) $this->trackChange($field, $existingUserID, $user->id); if($existingUserID != $user->id) $this->trackChange($field, $existingUserID, $user->id);
$this->settings[$field] = $user->id; $this->settings[$field] = $user->id;
return $this; return $this;
} }
@@ -2128,7 +2156,9 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function find($selector = '', $options = array()) { public function find($selector = '', $options = array()) {
if(!$this->numChildren) return $this->wire('pages')->newPageArray(); if(!$this->numChildren) {
return $this->wire()->pages->newPageArray();
}
if(is_string($selector)) { if(is_string($selector)) {
$selector = trim("has_parent={$this->id}, $selector", ", "); $selector = trim("has_parent={$this->id}, $selector", ", ");
} else if(is_array($selector)) { } else if(is_array($selector)) {
@@ -2158,7 +2188,9 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function findOne($selector = '', $options = array()) { public function findOne($selector = '', $options = array()) {
if(!$this->numChildren) return $this->wire('pages')->newNullPage(); if(!$this->numChildren) {
return $this->wire()->pages->newNullPage();
}
if(is_string($selector)) { if(is_string($selector)) {
$selector = trim("has_parent={$this->id}, $selector", ", "); $selector = trim("has_parent={$this->id}, $selector", ", ");
} else if(is_array($selector)) { } else if(is_array($selector)) {
@@ -2309,13 +2341,13 @@ class Page extends WireData implements \Countable, WireMatchable {
if($this->_parent_id) { if($this->_parent_id) {
$this->_parent = $this->_pages('get', (int) $this->_parent_id); $this->_parent = $this->_pages('get', (int) $this->_parent_id);
} else { } else {
return $this->wire('pages')->newNullPage(); return $this->wire()->pages->newNullPage();
} }
} }
if(empty($selector)) return $this->_parent; if(empty($selector)) return $this->_parent;
if($this->_parent->matches($selector)) return $this->_parent; if($this->_parent->matches($selector)) return $this->_parent;
if($this->_parent->parent_id) return $this->_parent->parent($selector); // recursive, in a way if($this->_parent->parent_id) return $this->_parent->parent($selector); // recursive, in a way
return $this->wire('pages')->newNullPage(); return $this->wire()->pages->newNullPage();
} }
/** /**
@@ -2692,8 +2724,10 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function getLanguages() { public function getLanguages() {
$languages = $this->wire('pages')->newPageArray(); $languages = $this->wire()->pages->newPageArray();
$templateLanguages = $this->template->getLanguages(); $template = $this->template();
if(!$template) return null;
$templateLanguages = $template->getLanguages();
if(!$templateLanguages) return null; if(!$templateLanguages) return null;
foreach($templateLanguages as $language) { foreach($templateLanguages as $language) {
if($this->viewable($language, false)) $languages->add($language); if($this->viewable($language, false)) $languages->add($language);
@@ -2729,23 +2763,26 @@ class Page extends WireData implements \Countable, WireMatchable {
*/ */
public function save($field = null, array $options = array()) { public function save($field = null, array $options = array()) {
$pages = $this->wire()->pages;
if(is_array($field) && empty($options)) { if(is_array($field) && empty($options)) {
$options = $field; $options = $field;
$field = null; $field = null;
} }
if(empty($field)) { if(empty($field)) {
return $this->wire('pages')->save($this, $options); return $pages->save($this, $options);
} }
if($this->hasField($field)) { if($this->hasField($field)) {
// save field // save field
return $this->wire('pages')->saveField($this, $field, $options); return $pages->saveField($this, $field, $options);
} }
// save only native properties // save only native properties
$options['noFields'] = true; $options['noFields'] = true;
return $this->wire('pages')->save($this, $options);
return $pages->save($this, $options);
} }
/** /**
@@ -2835,7 +2872,7 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function delete($recursive = false) { public function delete($recursive = false) {
return $this->wire('pages')->delete($this, $recursive); return $this->wire()->pages->delete($this, $recursive);
} }
/** /**
@@ -2856,7 +2893,7 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function trash() { public function trash() {
return $this->wire('pages')->trash($this); return $this->wire()->pages->trash($this);
} }
/** /**
@@ -2909,8 +2946,9 @@ class Page extends WireData implements \Countable, WireMatchable {
*/ */
public function getIterator() { public function getIterator() {
$a = $this->settings; $a = $this->settings;
if($this->template && $this->template->fieldgroup) { $template = $this->template();
foreach($this->template->fieldgroup as $field) { if($template && $template->fieldgroup) {
foreach($template->fieldgroup as $field) {
$a[$field->name] = $this->get($field->name); $a[$field->name] = $this->get($field->name);
} }
} }
@@ -3029,7 +3067,7 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function path() { public function path() {
return $this->wire('hooks')->isHooked('Page::path()') ? $this->__call('path', array()) : $this->___path(); return $this->wire()->hooks->isHooked('Page::path()') ? $this->__call('path', array()) : $this->___path();
} }
/** /**
@@ -3157,8 +3195,9 @@ class Page extends WireData implements \Countable, WireMatchable {
*/ */
public function url($options = null) { public function url($options = null) {
if($options !== null) return $this->traversal()->urlOptions($this, $options); if($options !== null) return $this->traversal()->urlOptions($this, $options);
$url = rtrim($this->wire('config')->urls->root, '/') . $this->path(); $url = rtrim($this->wire()->config->urls->root, '/') . $this->path();
if($this->template->slashUrls === 0 && $this->settings['id'] > 1) $url = rtrim($url, '/'); $template = $this->template();
if($template && $template->slashUrls === 0 && $this->settings['id'] > 1) $url = rtrim($url, '/');
return $url; return $url;
} }
@@ -3218,22 +3257,7 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function httpUrl($options = array()) { public function httpUrl($options = array()) {
$template = $this->template; return $this->traversal()->httpUrl($this, $options);
if(!$template) return '';
if(is_array($options)) unset($options['http']);
if($options === true || $options === false) $options = array();
$url = $this->url($options);
if(strpos($url, '://')) return $url;
$config = $this->wire()->config;
$mode = $template->https;
if($mode > 0 && $config->noHTTPS) $mode = 0;
switch($mode) {
case -1: $scheme = 'http'; break;
case 1: $scheme = 'https'; break;
default: $scheme = $config->https ? 'https' : 'http';
}
$url = "$scheme://$config->httpHost$url";
return $url;
} }
/** /**
@@ -3259,44 +3283,7 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function editUrl($options = array()) { public function editUrl($options = array()) {
/** @var Config $config */ return $this->traversal()->editUrl($this, $options);
$config = $this->wire('config');
/** @var Template $adminTemplate */
$adminTemplate = $this->wire('templates')->get('admin');
$https = $adminTemplate && ($adminTemplate->https > 0) && !$config->noHTTPS;
$url = ($https && !$config->https) ? 'https://' . $config->httpHost : '';
$url .= $config->urls->admin . "page/edit/?id=$this->id";
if($options === true || (is_array($options) && !empty($options['http']))) {
if(strpos($url, '://') === false) {
$url = ($https ? 'https://' : 'http://') . $config->httpHost . $url;
}
}
if($this->wire('languages')) {
$language = $this->wire('user')->language;
if(empty($options['language'])) {
if($this->wire('page')->template->id == $adminTemplate->id) $language = null;
} else if($options['language'] instanceof Page) {
$language = $options['language'];
} else if($options['language'] !== true) {
$language = $this->wire('languages')->get($options['language']);
}
if($language && $language->id) $url .= "&language=$language->id";
}
$append = $this->wire('session')->getFor($this, 'appendEditUrl');
if($append) $url .= $append;
if($options) {
if(is_string($options)) {
$find = $options;
} else if(is_array($options) && !empty($options['find'])) {
$find = $options['find'];
} else $find = '';
if($find && strpos($url, '#') === false) {
$url .= '#find-' . $this->wire('sanitizer')->fieldName($find);
}
}
return $url;
} }
/** /**
@@ -3313,7 +3300,8 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function sortfield() { public function sortfield() {
$sortfield = $this->template ? $this->template->sortfield : ''; $template = $this->template();
$sortfield = $template ? $template->sortfield : '';
if(!$sortfield) $sortfield = $this->settings['sortfield']; if(!$sortfield) $sortfield = $this->settings['sortfield'];
if(!$sortfield) $sortfield = 'sort'; if(!$sortfield) $sortfield = 'sort';
return $sortfield; return $sortfield;
@@ -3364,11 +3352,12 @@ class Page extends WireData implements \Countable, WireMatchable {
*/ */
public function output($forceNew = false) { public function output($forceNew = false) {
if($this->output && !$forceNew) return $this->output; if($this->output && !$forceNew) return $this->output;
if(!$this->template) return null; $template = $this->template();
if(!$template) return null;
$this->output = $this->wire(new TemplateFile()); $this->output = $this->wire(new TemplateFile());
$this->output->setThrowExceptions(false); $this->output->setThrowExceptions(false);
$this->output->setFilename($this->template->filename); $this->output->setFilename($template->filename);
$fuel = $this->wire('fuel')->getArray(); $fuel = $this->wire()->fuel->getArray();
$this->output->set('wire', $this->wire()); $this->output->set('wire', $this->wire());
foreach($fuel as $key => $value) $this->output->set($key, $value); foreach($fuel as $key => $value) $this->output->set($key, $value);
$this->output->set('page', $this); $this->output->set('page', $this);
@@ -3411,7 +3400,7 @@ class Page extends WireData implements \Countable, WireMatchable {
*/ */
public function ___renderField($fieldName, $file = '', $value = null) { public function ___renderField($fieldName, $file = '', $value = null) {
/** @var PageRender $pageRender */ /** @var PageRender $pageRender */
$pageRender = $this->wire('modules')->get('PageRender'); $pageRender = $this->wire()->modules->get('PageRender');
return $pageRender->renderField($this, $fieldName, $file, $value); return $pageRender->renderField($this, $fieldName, $file, $value);
} }
@@ -3455,19 +3444,26 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function getInputfields($fieldName = '') { public function getInputfields($fieldName = '') {
$of = $this->of(); $of = $this->of();
if($of) $this->of(false); if($of) $this->of(false);
if($this->template) {
$template = $this->template();
$fieldgroup = $template ? $template->fieldgroup : null;
if($fieldgroup) {
if(is_array($fieldName) && !ctype_digit(implode('', array_keys($fieldName)))) { if(is_array($fieldName) && !ctype_digit(implode('', array_keys($fieldName)))) {
// fieldName is an associative array of options for Fieldgroup::getPageInputfields // fieldName is an associative array of options for Fieldgroup::getPageInputfields
$wrapper = $this->template->fieldgroup->getPageInputfields($this, $fieldName); $wrapper = $fieldgroup->getPageInputfields($this, $fieldName);
} else { } else {
$wrapper = $this->template->fieldgroup->getPageInputfields($this, '', $fieldName); $wrapper = $fieldgroup->getPageInputfields($this, '', $fieldName);
} }
} else { } else {
$wrapper = null; $wrapper = null;
} }
if($of) $this->of(true); if($of) $this->of(true);
return $wrapper; return $wrapper;
} }
@@ -3489,8 +3485,8 @@ class Page extends WireData implements \Countable, WireMatchable {
public function getInputfield($fieldName) { public function getInputfield($fieldName) {
$inputfields = $this->getInputfields($fieldName); $inputfields = $this->getInputfields($fieldName);
if($inputfields) { if($inputfields) {
$field = $this->wire('fields')->get($fieldName); $field = $this->wire()->fields->get($fieldName);
if($field && $field instanceof FieldtypeFieldsetOpen) { if($field && $field->type instanceof FieldtypeFieldsetOpen) {
// requested field name is a fieldset, returns InputfieldWrapper // requested field name is a fieldset, returns InputfieldWrapper
return $inputfields; return $inputfields;
} else { } else {
@@ -3755,11 +3751,11 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function isTrash() { public function isTrash() {
if($this->hasStatus(self::statusTrash)) return true; if($this->hasStatus(self::statusTrash)) return true;
$trashPageID = $this->wire('config')->trashPageID; $trashPageID = (int) $this->wire()->config->trashPageID;
if($this->id == $trashPageID) return true; if($this->id === (int) $trashPageID) return true;
// this is so that isTrash() still returns the correct result, even if the page was just trashed and not yet saved // this is so that isTrash() still returns the correct result, even if the page was just trashed and not yet saved
foreach($this->parents() as $parent) if($parent->id == $trashPageID) return true; foreach($this->parents() as $parent) if($parent->id === $trashPageID) return true;
return false; return false;
} }
@@ -3776,7 +3772,7 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function isPublic() { public function isPublic() {
return $this->wire('hooks')->isHooked('Page::isPublic()') ? $this->__call('isPublic', array()) : $this->___isPublic(); return $this->wire()->hooks->isHooked('Page::isPublic()') ? $this->__call('isPublic', array()) : $this->___isPublic();
} }
/** /**
@@ -3884,8 +3880,9 @@ class Page extends WireData implements \Countable, WireMatchable {
*/ */
protected function processFieldDataQueue() { protected function processFieldDataQueue() {
$template = $this->template; $template = $this->template();
if(!$template) return; if(!$template) return;
$fieldgroup = $template->fieldgroup; $fieldgroup = $template->fieldgroup;
if(!$fieldgroup) return; if(!$fieldgroup) return;
@@ -4024,8 +4021,9 @@ class Page extends WireData implements \Countable, WireMatchable {
*/ */
public function secureFiles() { public function secureFiles() {
if($this->wire()->config->pagefileSecure && !$this->isPublic()) return true; if($this->wire()->config->pagefileSecure && !$this->isPublic()) return true;
if(!$this->template) return null; $template = $this->template();
$value = $this->template->pagefileSecure; if(!$template) return null;
$value = $template->pagefileSecure;
if($value < 1) return false; // 0: disabled if($value < 1) return false; // 0: disabled
if($value > 1) return true; // 2: files always secure if($value > 1) return true; // 2: files always secure
return !$this->isPublic(); // 1: secure only if page not public return !$this->isPublic(); // 1: secure only if page not public
@@ -4125,8 +4123,9 @@ class Page extends WireData implements \Countable, WireMatchable {
public function uncache() { public function uncache() {
$trackChanges = $this->trackChanges(); $trackChanges = $this->trackChanges();
if($trackChanges) $this->setTrackChanges(false); if($trackChanges) $this->setTrackChanges(false);
if($this->template) { $template = $this->template();
foreach($this->template->fieldgroup as $field) { if($template) {
foreach($template->fieldgroup as $field) {
$value = parent::get($field->name); $value = parent::get($field->name);
if($value != null && is_object($value)) { if($value != null && is_object($value)) {
parent::set($field->name, null); parent::set($field->name, null);
@@ -4386,15 +4385,16 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function ___getIcon() { public function ___getIcon() {
if(!$this->template) return ''; $template = $this->template();
if(!$template) return '';
if($this->hasField('process')) { if($this->hasField('process')) {
$process = $this->getUnformatted('process'); $process = $this->getUnformatted('process');
if($process) { if($process) {
$info = $this->wire('modules')->getModuleInfoVerbose($process); $info = $this->wire()->modules->getModuleInfoVerbose($process);
if(!empty($info['icon'])) return $info['icon']; if(!empty($info['icon'])) return $info['icon'];
} }
} }
return $this->template->getIcon(); return $template->getIcon();
} }
/** /**
@@ -4406,9 +4406,8 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function getPagesManager() { public function getPagesManager() {
return $this->wire('pages'); return $this->wire()->pages;
} }
/** /**
* Get lazy loading state, set lazy load state, or trigger the page to load * Get lazy loading state, set lazy load state, or trigger the page to load
@@ -4448,8 +4447,7 @@ class Page extends WireData implements \Countable, WireMatchable {
// load page // load page
if(!is_int($this->lazyLoad) || $this->lazyLoad < 1) return false; if(!is_int($this->lazyLoad) || $this->lazyLoad < 1) return false;
$this->lazyLoad = true; $this->lazyLoad = true;
$pages = $this->wire('pages'); $page = $this->wire()->pages->getById($this->id, array(
$page = $pages->getById($this->id, array(
'cache' => false, 'cache' => false,
'getOne' => true, 'getOne' => true,
'page' => $this // This. Just This. 'page' => $this // This. Just This.
@@ -4475,10 +4473,10 @@ class Page extends WireData implements \Countable, WireMatchable {
* *
*/ */
public function _pages($method = '', $selector = '', $options = array()) { public function _pages($method = '', $selector = '', $options = array()) {
if(empty($method)) return $this->wire('pages'); if(empty($method)) return $this->wire()->pages;
if(!isset($options['cache'])) $options['cache'] = $this->loaderCache; if(!isset($options['cache'])) $options['cache'] = $this->loaderCache;
if(!isset($options['caller'])) $options['caller'] = "page._pages.$method"; if(!isset($options['caller'])) $options['caller'] = "page._pages.$method";
$result = $this->wire('pages')->$method($selector, $options); $result = $this->wire()->pages->$method($selector, $options);
return $result; return $result;
} }

17
wire/core/PageAccess.php
View File

@@ -46,7 +46,7 @@ class PageAccess {
if(is_string($name)) { if(is_string($name)) {
// good // good
} else if(is_int($name)) { } else if(is_int($name)) {
$permission = $this->wire('permissions')->get($name); $permission = $this->wire()->permissions->get($name);
$name = $permission ? $permission->name : 'edit'; $name = $permission ? $permission->name : 'edit';
} else if($name instanceof Permission) { } else if($name instanceof Permission) {
$name = $name->name; $name = $name->name;
@@ -68,14 +68,17 @@ class PageAccess {
* *
*/ */
public function getAccessParent(Page $page, $type = 'view', $level = 0) { public function getAccessParent(Page $page, $type = 'view', $level = 0) {
if(!$page->id) return $page->wire('pages')->newNullPage();
$pages = $page->wire()->pages;
if(!$page->id) return $pages->newNullPage();
if(!in_array($type, $this->types)) $type = $this->getType($type); if(!in_array($type, $this->types)) $type = $this->getType($type);
if($page->id === 1 || $page->template->useRoles) { if($page->id === 1 || $page->template->useRoles) {
// found an access parent // found an access parent
if($type != 'view' && $level > 0 && $page->template->noInherit != 0) { if($type != 'view' && $level > 0 && $page->template->noInherit != 0) {
// access parent prohibits inheritance of edit-related permissions // access parent prohibits inheritance of edit-related permissions
return $page->wire('pages')->newNullPage(); return $pages->newNullPage();
} }
return $page; return $page;
} }
@@ -84,14 +87,14 @@ class PageAccess {
if($type === 'edit' && $page->isTrash() && $page->id != $page->wire('config')->trashPageID) { if($type === 'edit' && $page->isTrash() && $page->id != $page->wire('config')->trashPageID) {
// pages in trash have an edit access parent as whatever it was prior to being trashed // pages in trash have an edit access parent as whatever it was prior to being trashed
$info = $page->wire('pages')->trasher()->parseTrashPageName($page->name); $info = $pages->trasher()->parseTrashPageName($page->name);
if(!empty($info['parent_id'])) $parent = $page->wire('pages')->get((int) $info['parent_id']); if(!empty($info['parent_id'])) $parent = $pages->get((int) $info['parent_id']);
} }
if(!$parent || !$parent->id) $parent = $page->parent(); if(!$parent || !$parent->id) $parent = $page->parent();
if($parent->id) return $this->getAccessParent($parent, $type, $level + 1); if($parent->id) return $this->getAccessParent($parent, $type, $level + 1);
return $page->wire('pages')->newNullPage(); return $pages->newNullPage();
} }
/** /**
@@ -122,7 +125,7 @@ class PageAccess {
public function getAccessRoles(Page $page, $type = 'view') { public function getAccessRoles(Page $page, $type = 'view') {
$template = $this->getAccessTemplate($page, $type); $template = $this->getAccessTemplate($page, $type);
if($template) return $template->getRoles($this->getType($type)); if($template) return $template->getRoles($this->getType($type));
return $page->wire('pages')->newPageArray(); return $page->wire()->pages->newPageArray();
} }
/** /**

5
wire/core/PageComparison.php
View File

@@ -57,7 +57,7 @@ class PageComparison {
} }
if($n && count($status) === $n) $is = true; if($n && count($status) === $n) $is = true;
} else if(is_string($status) && $page->wire('sanitizer')->name($status) === $status) { } else if(is_string($status) && $page->wire()->sanitizer->name($status) === $status) {
// name string (status name or template name) // name string (status name or template name)
$statuses = Page::getStatuses(); $statuses = Page::getStatuses();
if(isset($statuses[$status])) { if(isset($statuses[$status])) {
@@ -101,8 +101,7 @@ class PageComparison {
*/ */
public function _if(Page $page, $key, $yes = '', $no = '') { public function _if(Page $page, $key, $yes = '', $no = '') {
/** @var Sanitizer $sanitizer */ $sanitizer = $page->wire()->sanitizer;
$sanitizer = $page->wire('sanitizer');
// if only given a key argument, we will be returning a boolean // if only given a key argument, we will be returning a boolean
if($yes === '' && $no === '') list($yes, $no) = array(true, false); if($yes === '' && $no === '') list($yes, $no) = array(true, false);

179
wire/core/PageTraversal.php
View File

@@ -6,7 +6,7 @@
* Provides implementation for Page traversal functions. * Provides implementation for Page traversal functions.
* Based upon the jQuery traversal functions. * Based upon the jQuery traversal functions.
* *
* ProcessWire 3.x, Copyright 2016 by Ryan Cramer * ProcessWire 3.x, Copyright 2021 by Ryan Cramer
* https://processwire.com * https://processwire.com
* *
*/ */
@@ -54,10 +54,11 @@ class PageTraversal {
// viewable pages only // viewable pages only
$numChildren = $page->get('numChildren'); $numChildren = $page->get('numChildren');
if(!$numChildren) return 0; if(!$numChildren) return 0;
if($page->wire('user')->isSuperuser()) { $user = $page->wire()->user;
if($user->isSuperuser()) {
if($descendants) return $this->numDescendants($page); if($descendants) return $this->numDescendants($page);
return $numChildren; return $numChildren;
} else if($page->wire('user')->hasPermission('page-edit')) { } else if($user->hasPermission('page-edit')) {
return $page->_pages('count', "$parentType=$page->id, include=unpublished"); return $page->_pages('count', "$parentType=$page->id, include=unpublished");
} else { } else {
return $page->_pages('count', "$parentType=$page->id, include=hidden"); return $page->_pages('count', "$parentType=$page->id, include=hidden");
@@ -165,7 +166,7 @@ class PageTraversal {
* *
*/ */
public function parents(Page $page, $selector = '') { public function parents(Page $page, $selector = '') {
$parents = $page->wire('pages')->newPageArray(); $parents = $page->wire()->pages->newPageArray();
$parent = $page->parent(); $parent = $page->parent();
$method = $selector === true ? 'add' : 'prepend'; $method = $selector === true ? 'add' : 'prepend';
while($parent && $parent->id) { while($parent && $parent->id) {
@@ -209,7 +210,7 @@ class PageTraversal {
public function parentsUntil(Page $page, $selector = '', $filter = '') { public function parentsUntil(Page $page, $selector = '', $filter = '') {
$parents = $this->parents($page); $parents = $this->parents($page);
$matches = $page->wire('pages')->newPageArray(); $matches = $page->wire()->pages->newPageArray();
$stop = false; $stop = false;
foreach($parents->reverse() as $parent) { foreach($parents->reverse() as $parent) {
@@ -392,7 +393,7 @@ class PageTraversal {
); );
$options = array_merge($defaults, $options); $options = array_merge($defaults, $options);
$pages = $page->wire('pages'); $pages = $page->wire()->pages;
$parent = $page->parent(); $parent = $page->parent();
if($options['until'] || $options['qty']) $options['all'] = true; if($options['until'] || $options['qty']) $options['all'] = true;
@@ -432,7 +433,7 @@ class PageTraversal {
$row = reset($rows); $row = reset($rows);
if($row && !empty($row['id'])) { if($row && !empty($row['id'])) {
$result = $pages->getById(array($row['id']), array( $result = $pages->getById(array($row['id']), array(
'template' => $page->wire('templates')->get($row['templates_id']), 'template' => $page->wire()->templates->get($row['templates_id']),
'parent_id' => $row['parent_id'], 'parent_id' => $row['parent_id'],
'getOne' => true, 'getOne' => true,
'cache' => $page->loaderCache 'cache' => $page->loaderCache
@@ -630,15 +631,17 @@ class PageTraversal {
$options = is_array($options) ? array_merge($defaults, $options) : $defaults; $options = is_array($options) ? array_merge($defaults, $options) : $defaults;
$sanitizer = $page->wire()->sanitizer; $sanitizer = $page->wire()->sanitizer;
$input = $page->wire()->input;
$modules = $page->wire()->modules;
$language = null; $language = null;
$url = null; $url = null;
if($options['urlSegments'] === true || $options['urlSegmentStr'] === true) { if($options['urlSegments'] === true || $options['urlSegmentStr'] === true) {
$options['urlSegments'] = $page->wire('input')->urlSegments(); $options['urlSegments'] = $input->urlSegments();
} }
if($options['pageNum'] === true) { if($options['pageNum'] === true) {
$options['pageNum'] = $page->wire('input')->pageNum(); $options['pageNum'] = $input->pageNum();
} }
if(count($options['urlSegments'])) { if(count($options['urlSegments'])) {
@@ -658,7 +661,7 @@ class PageTraversal {
} }
} }
if($options['language'] && $page->wire('modules')->isInstalled('LanguageSupportPageNames')) { if($options['language'] && $modules->isInstalled('LanguageSupportPageNames')) {
if(!is_object($options['language'])) { if(!is_object($options['language'])) {
$options['language'] = null; $options['language'] = null;
} else if(!$options['language'] instanceof Page) { } else if(!$options['language'] instanceof Page) {
@@ -686,14 +689,15 @@ class PageTraversal {
if($options['pageNum']) { if($options['pageNum']) {
if($options['pageNum'] === '+') { if($options['pageNum'] === '+') {
$options['pageNum'] = $page->wire('input')->pageNum + 1; $options['pageNum'] = $input->pageNum + 1;
} else if($options['pageNum'] === '-' || $options['pageNum'] === -1) { } else if($options['pageNum'] === '-' || $options['pageNum'] === -1) {
$options['pageNum'] = $page->wire('input')->pageNum - 1; $options['pageNum'] = $input->pageNum - 1;
} }
if((int) $options['pageNum'] > 1) { if((int) $options['pageNum'] > 1) {
$prefix = ''; $prefix = '';
if($language) { if($language) {
$lsp = $page->wire('modules')->get('LanguageSupportPageNames'); /** @var LanguageSupportPageNames $lsp */
$lsp = $modules->get('LanguageSupportPageNames');
$prefix = $lsp ? $lsp->get("pageNumUrlPrefix$language") : ''; $prefix = $lsp ? $lsp->get("pageNumUrlPrefix$language") : '';
} }
if(!strlen($prefix)) $prefix = $config->pageNumUrlPrefix; if(!strlen($prefix)) $prefix = $config->pageNumUrlPrefix;
@@ -763,11 +767,11 @@ class PageTraversal {
); );
/** @var Modules $modules */ /** @var Modules $modules */
$modules = $page->wire('modules'); $modules = $page->wire()->modules;
$options = array_merge($defaults, $options); $options = array_merge($defaults, $options);
$languages = $options['languages'] ? $page->wire('languages') : null; $languages = $options['languages'] ? $page->wire()->languages : null;
$slashUrls = $page->template->slashUrls; $slashUrls = $page->template->slashUrls;
$httpHostUrl = $options['http'] ? $page->wire('input')->httpHostUrl() : ''; $httpHostUrl = $options['http'] ? $page->wire()->input->httpHostUrl() : '';
$urls = array(); $urls = array();
if($options['language'] && $languages) { if($options['language'] && $languages) {
@@ -793,7 +797,7 @@ class PageTraversal {
if($options['past'] && $modules->isInstalled('PagePathHistory')) { if($options['past'] && $modules->isInstalled('PagePathHistory')) {
/** @var PagePathHistory $history */ /** @var PagePathHistory $history */
$history = $modules->get('PagePathHistory'); $history = $modules->get('PagePathHistory');
$rootUrl = $page->wire('config')->urls->root; $rootUrl = $page->wire()->config->urls->root;
$pastPaths = $history->getPathHistory($page, array( $pastPaths = $history->getPathHistory($page, array(
'language' => $options['language'], 'language' => $options['language'],
'verbose' => true 'verbose' => true
@@ -824,6 +828,121 @@ class PageTraversal {
return $urls; return $urls;
} }
/**
* Return the URL necessary to edit page
*
* - We recommend checking that the page is editable before outputting the editUrl().
* - If user opens URL in their browser and is not logged in, they must login to account with edit permission.
* - This method can also be accessed by property at `$page->editUrl` (without parenthesis).
*
* ~~~~~~
* if($page->editable()) {
* echo "<a href='$page->editUrl'>Edit this page</a>";
* }
* ~~~~~~
*
* @param Page $page
* @param array|bool|string $options Specify true for http option, specify name of field to find (3.0.151+), or use $options array:
* - `http` (bool): True to force scheme and hostname in URL (default=auto detect).
* - `language` (Language|bool): Optionally specify Language to start editor in, or boolean true to force current user language.
* - `find` (string): Name of field to find in the editor (3.0.151+)
* @return string URL for editing this page
*
*/
public function editUrl(Page $page, $options = array()) {
$config = $page->wire()->config;
$adminTemplate = $page->wire()->templates->get('admin'); /** @var Template $adminTemplate */
$https = $adminTemplate && ($adminTemplate->https > 0) && !$config->noHTTPS;
$url = ($https && !$config->https) ? 'https://' . $config->httpHost : '';
$url .= $config->urls->admin . "page/edit/?id=$page->id";
if($options === true || (is_array($options) && !empty($options['http']))) {
if(strpos($url, '://') === false) {
$url = ($https ? 'https://' : 'http://') . $config->httpHost . $url;
}
}
$languages = $page->wire()->languages;
if($languages) {
$language = $page->wire()->user->language;
if(empty($options['language'])) {
if($page->wire()->page->template->id == $adminTemplate->id) $language = null;
} else if($options['language'] instanceof Page) {
$language = $options['language'];
} else if($options['language'] !== true) {
$language = $languages->get($options['language']);
}
if($language && $language->id) $url .= "&language=$language->id";
}
$append = $page->wire()->session->getFor($page, 'appendEditUrl');
if($append) $url .= $append;
if($options) {
if(is_string($options)) {
$find = $options;
} else if(is_array($options) && !empty($options['find'])) {
$find = $options['find'];
} else $find = '';
if($find && strpos($url, '#') === false) {
$url .= '#find-' . $page->wire()->sanitizer->fieldName($find);
}
}
return $url;
}
/**
* Returns the URL to the page, including scheme and hostname
*
* - This method is just like the `$page->url()` method except that it also includes scheme and hostname.
*
* - This method can also be accessed at the property `$page->httpUrl` (without parenthesis).
*
* - It is desirable to use this method when some page templates require https while others don't.
* This ensures local links will always point to pages with the proper scheme. For other cases, it may
* be preferable to use `$page->url()` since it produces shorter output.
*
* ~~~~~
* // Generating a link to this page using httpUrl
* echo "<a href='$page->httpUrl'>$page->title</a>";
* ~~~~~
*
* @param Page $page
* @param array $options For details on usage see `Page::url()` options argument.
* @return string Returns full URL to page, for example: `https://processwire.com/about/`
* @see Page::url(), Page::localHttpUrl()
*
*/
public function httpUrl(Page $page, $options = array()) {
$template = $page->template();
if(!$template) return '';
if(is_array($options)) unset($options['http']);
if($options === true || $options === false) $options = array();
$url = $page->url($options);
if(strpos($url, '://')) return $url;
$config = $page->wire()->config;
$mode = $template->https;
if($mode > 0 && $config->noHTTPS) $mode = 0;
switch($mode) {
case -1: $scheme = 'http'; break;
case 1: $scheme = 'https'; break;
default: $scheme = $config->https ? 'https' : 'http';
}
$url = "$scheme://$config->httpHost$url";
return $url;
}
/** /**
* Return pages that are referencing the given one by way of Page references * Return pages that are referencing the given one by way of Page references
@@ -838,7 +957,8 @@ class PageTraversal {
* *
*/ */
public function references(Page $page, $selector = '', $field = '', $getCount = false) { public function references(Page $page, $selector = '', $field = '', $getCount = false) {
$fieldtype = $page->wire('fieldtypes')->get('FieldtypePage'); /** @var FieldtypePage $fieldtype */
$fieldtype = $page->wire()->fieldtypes->get('FieldtypePage');
if(!$fieldtype) throw new WireException('Unable to find FieldtypePage'); if(!$fieldtype) throw new WireException('Unable to find FieldtypePage');
if($selector === true) $selector = "include=all"; if($selector === true) $selector = "include=all";
return $fieldtype->findReferences($page, $selector, $field, $getCount); return $fieldtype->findReferences($page, $selector, $field, $getCount);
@@ -890,9 +1010,9 @@ class PageTraversal {
if(is_bool($field) || is_null($field)) { if(is_bool($field) || is_null($field)) {
$byField = $field ? true : false; $byField = $field ? true : false;
} else if(is_string($field)) { } else if(is_string($field)) {
$fieldName = $page->wire('sanitizer')->fieldName($field); $fieldName = $page->wire()->sanitizer->fieldName($field);
} else if(is_int($field)) { } else if(is_int($field)) {
$field = $page->wire('fields')->get($field); $field = $page->wire()->fields->get($field);
if($field) $fieldName = $field->name; if($field) $fieldName = $field->name;
} else if($field instanceof Field) { } else if($field instanceof Field) {
$fieldName = $field->name; $fieldName = $field->name;
@@ -900,13 +1020,14 @@ class PageTraversal {
// results // results
$fieldCounts = array(); // counts indexed by field name (if count mode) $fieldCounts = array(); // counts indexed by field name (if count mode)
$items = $page->wire('pages')->newPageArray(); $pages = $page->wire()->pages;
$items = $pages->newPageArray();
$itemsByField = array(); $itemsByField = array();
foreach($page->template->fieldgroup as $f) { foreach($page->template->fieldgroup as $f) {
if($fieldName && $field->name != $fieldName) continue; if($fieldName && $field->name != $fieldName) continue;
if(!$f->type instanceof FieldtypePage) continue; if(!$f->type instanceof FieldtypePage) continue;
if($byField) $itemsByField[$f->name] = $page->wire('pages')->newPageArray(); if($byField) $itemsByField[$f->name] = $pages->newPageArray();
$value = $page->get($f->name); $value = $page->get($f->name);
if($value instanceof Page && $value->id) { if($value instanceof Page && $value->id) {
$items->add($value); $items->add($value);
@@ -956,7 +1077,7 @@ class PageTraversal {
*/ */
public function links(Page $page, $selector = '', $field = false, array $options = array()) { public function links(Page $page, $selector = '', $field = false, array $options = array()) {
/** @var FieldtypeTextarea $fieldtype */ /** @var FieldtypeTextarea $fieldtype */
$fieldtype = $page->wire('fieldtypes')->get('FieldtypeTextarea'); $fieldtype = $page->wire()->fieldtypes->get('FieldtypeTextarea');
if(!$fieldtype) throw new WireException('Unable to find FieldtypeTextarea'); if(!$fieldtype) throw new WireException('Unable to find FieldtypeTextarea');
return $fieldtype->findLinks($page, $selector, $field, $options); return $fieldtype->findLinks($page, $selector, $field, $options);
} }
@@ -1033,7 +1154,7 @@ class PageTraversal {
$next = $siblings->getNext($next, false); $next = $siblings->getNext($next, false);
if(empty($selector) || !$next || $next->matches($selector)) break; if(empty($selector) || !$next || $next->matches($selector)) break;
} while($next && $next->id); } while($next && $next->id);
if(is_null($next)) $next = $page->wire('pages')->newNullPage(); if(is_null($next)) $next = $page->wire()->pages->newNullPage();
return $next; return $next;
} }
@@ -1077,7 +1198,7 @@ class PageTraversal {
$prev = $siblings->getPrev($prev, false); $prev = $siblings->getPrev($prev, false);
if(empty($selector) || !$prev || $prev->matches($selector)) break; if(empty($selector) || !$prev || $prev->matches($selector)) break;
} while($prev && $prev->id); } while($prev && $prev->id);
if(is_null($prev)) $prev = $page->wire('pages')->newNullPage(); if(is_null($prev)) $prev = $page->wire()->pages->newNullPage();
return $prev; return $prev;
} }
@@ -1099,7 +1220,7 @@ class PageTraversal {
} }
$id = $page->id; $id = $page->id;
$all = $page->wire('pages')->newPageArray(); $all = $page->wire()->pages->newPageArray();
$rec = false; $rec = false;
foreach($siblings as $sibling) { foreach($siblings as $sibling) {
@@ -1133,7 +1254,7 @@ class PageTraversal {
} }
$id = $page->id; $id = $page->id;
$all = $page->wire('pages')->newPageArray(); $all = $page->wire()->pages->newPageArray();
foreach($siblings as $sibling) { foreach($siblings as $sibling) {
if($sibling->id == $id) break; if($sibling->id == $id) break;
@@ -1164,7 +1285,7 @@ class PageTraversal {
} }
$siblings = $this->nextAllSiblings($page, '', $siblings); $siblings = $this->nextAllSiblings($page, '', $siblings);
$all = $page->wire('pages')->newPageArray(); $all = $page->wire()->pages->newPageArray();
$stop = false; $stop = false;
foreach($siblings as $sibling) { foreach($siblings as $sibling) {
@@ -1215,7 +1336,7 @@ class PageTraversal {
} }
$siblings = $this->prevAllSiblings($page, '', $siblings); $siblings = $this->prevAllSiblings($page, '', $siblings);
$all = $page->wire('pages')->newPageArray(); $all = $page->wire()->pages->newPageArray();
$stop = false; $stop = false;
foreach($siblings->reverse() as $sibling) { foreach($siblings->reverse() as $sibling) {