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

Fix issue processwire/processwire-issues#1897

Browse Source
This commit is contained in:
Ryan Cramer
2024-03-28 09:35:40 -04:00
parent 21949387b4
commit 6e1d7b166d
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wire/core/PagesLoader.php
View File

@@ -786,24 +786,30 @@ class PagesLoader extends Wire {
$items = $this->pages->find($selector, $options); $items = $this->pages->find($selector, $options);
$page = $items->first(); $page = $items->first();
if($page && !$page->viewable(false)) { if(isset($options['findAll']) && $options['findAll'] === true) {
// page is always allowed through when findAll=true
} else if(isset($options['include']) && $options['include'] === 'all') {
// page is always allowed through when include=all
} else if($page && !$page->viewable(false)) {
// page found but is not viewable, check if include mode was specified and would allow the page // page found but is not viewable, check if include mode was specified and would allow the page
$include = isset($options['include']) ? strtolower($options['include']) : null;
$checkAccess = true;
$selectors = $items->getSelectors(); $selectors = $items->getSelectors();
if($selectors) { if($selectors) {
if($include === null) {
$include = $selectors->getSelectorByField('include'); $include = $selectors->getSelectorByField('include');
if($include) $include = strtolower($include->value());
}
$checkAccess = $selectors->getSelectorByField('check_access'); $checkAccess = $selectors->getSelectorByField('check_access');
if(!$checkAccess) $checkAccess = $selectors->getSelectorByField('checkAccess'); if(!$checkAccess) $checkAccess = $selectors->getSelectorByField('checkAccess');
$checkAccess = $checkAccess ? (bool) $checkAccess->value() : true; $checkAccess = $checkAccess ? (bool) $checkAccess->value() : true;
} else {
$include = null;
$checkAccess = true;
} }
if(!$include) { if(!$include) {
// there was no “include=” selector present // there was no “include=” selector present
if($checkAccess === true) $page = null; if($checkAccess === true) $page = null;
} else if($include->value() === 'all') { } else if($include === 'all') {
// allow $page to pass through with include=all mode // allow $page to pass through with include=all mode
} else if($include->value() === 'unpublished' && $page->hasStatus(Page::statusUnpublished) && $checkAccess) { } else if($include === 'unpublished' && $page->isUnpublished() && $checkAccess) {
// check if user would have access without unpublished status // check if user would have access without unpublished status
$status = $page->status; $status = $page->status;
$page->setQuietly('status', $status & ~Page::statusUnpublished); $page->setQuietly('status', $status & ~Page::statusUnpublished);