mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-09 16:26:59 +02:00
Code Issues Releases Wiki Activity

Attempt fix for processwire/processwire-issues#907

Browse Source
This commit is contained in:
Ryan Cramer
2019-06-26 10:15:54 -04:00
parent 3024314680
commit ab94e7b682
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
wire/core/PageFinder.php
View File

@@ -5,7 +5,7 @@
* *
* Matches selector strings to pages * Matches selector strings to pages
* *
* ProcessWire 3.x, Copyright 2016 by Ryan Cramer * ProcessWire 3.x, Copyright 2019 by Ryan Cramer
* https://processwire.com * https://processwire.com
* *
* Hookable methods: * Hookable methods:
@@ -162,7 +162,8 @@ class PageFinder extends Wire {
protected $start = 0; protected $start = 0;
protected $parent_id = null; protected $parent_id = null;
protected $templates_id = null; protected $templates_id = null;
protected $checkAccess = true; protected $checkAccess = true; // becomes false if check_access=0 or include=all
protected $includeMode = ''; // include mode if specified (all, unpublished, hidden)
protected $getQueryNumChildren = 0; // number of times the function has been called protected $getQueryNumChildren = 0; // number of times the function has been called
protected $lastOptions = array(); protected $lastOptions = array();
protected $extraOrSelectors = array(); // one from each field must match protected $extraOrSelectors = array(); // one from each field must match
@@ -230,6 +231,7 @@ class PageFinder extends Wire {
if(!$not && (is_null($maxStatus) || $selector->value > $maxStatus)) $maxStatus = (int) $selector->value; if(!$not && (is_null($maxStatus) || $selector->value > $maxStatus)) $maxStatus = (int) $selector->value;
} else if($fieldName == 'include' && $selector->operator == '=' && in_array($selector->value, array('hidden', 'all', 'unpublished', 'trash'))) { } else if($fieldName == 'include' && $selector->operator == '=' && in_array($selector->value, array('hidden', 'all', 'unpublished', 'trash'))) {
$this->includeMode = $selector->value;
if($selector->value == 'hidden') $options['findHidden'] = true; if($selector->value == 'hidden') $options['findHidden'] = true;
else if($selector->value == 'unpublished') $options['findUnpublished'] = true; else if($selector->value == 'unpublished') $options['findUnpublished'] = true;
else if($selector->value == 'trash') $options['findTrash'] = true; else if($selector->value == 'trash') $options['findTrash'] = true;
@@ -2259,17 +2261,30 @@ class PageFinder extends Wire {
/** /**
* Get the include|status|check_access portions from given Selectors and return selector string for them * Get the include|status|check_access portions from given Selectors and return selector string for them
* *
* If given $selectors lacks an include or check_access selector, then it will pull from the
* equivalent PageFinder setting if present in the original initiating selector.
*
* @param Selectors|string $selectors * @param Selectors|string $selectors
* @return string * @return string
* *
*/ */
protected function getIncludeSelector($selectors) { protected function getIncludeSelector($selectors) {
if(!$selectors instanceof Selectors) $selectors = new Selectors($selectors); if(!$selectors instanceof Selectors) $selectors = new Selectors($selectors);
return trim( $a = array();
$selectors->getSelectorByField('include') . ',' .
$selectors->getSelectorByField('status') . ',' . $include = $selectors->getSelectorByField('include');
$selectors->getSelectorByField('check_access'), ',' if(empty($include) && $this->includeMode) $include = "include=$this->includeMode";
); if($include) $a[] = $include;
$status = $selectors->getSelectorByField('status');
if(!empty($status)) $a[] = $status;
$checkAccess = $selectors->getSelectorByField('check_access');
if(empty($checkAccess) && $this->checkAccess === false && $this->includeMode !== 'all') $checkAccess = "check_access=0";
if($checkAccess) $a[] = $checkAccess;
return implode(', ', $a);
} }
/** /**