mirror of
https://github.com/processwire/processwire.git
synced 2025-08-25 15:51:37 +02:00
Fix issue processwire/processwire-issues#779 where $pages('/') wasn't working
This commit is contained in:
@@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
* This is the most used object in the ProcessWire API.
|
* This is the most used object in the ProcessWire API.
|
||||||
*
|
*
|
||||||
* ProcessWire 3.x, Copyright 2016 by Ryan Cramer
|
* ProcessWire 3.x, Copyright 2019 by Ryan Cramer
|
||||||
* https://processwire.com
|
* https://processwire.com
|
||||||
*
|
*
|
||||||
* @link http://processwire.com/api/variables/pages/ Offical $pages Documentation
|
* @link http://processwire.com/api/variables/pages/ Offical $pages Documentation
|
||||||
@@ -349,7 +349,9 @@ class Pages extends Wire {
|
|||||||
unset($options['verbose']);
|
unset($options['verbose']);
|
||||||
}
|
}
|
||||||
$options['findIDs'] = $verbose ? true : 1;
|
$options['findIDs'] = $verbose ? true : 1;
|
||||||
return $this->find($selector, $options);
|
/** @var array $ids */
|
||||||
|
$ids = $this->find($selector, $options);
|
||||||
|
return $ids;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1306,11 +1308,11 @@ class Pages extends Wire {
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public function __invoke($key) {
|
public function __invoke($key) {
|
||||||
if(empty($key)) return $this;
|
if(empty($key)) return $this; // no argument
|
||||||
if(is_int($key)) return $this->get($key);
|
if(is_int($key)) return $this->get($key); // page ID
|
||||||
if(is_array($key)) return $this->getById($key);
|
if(is_array($key) && ctype_digit(implode('', $key))) return $this->getById($key); // array of page IDs
|
||||||
if(strpos($key, '/') === 0 && ctype_alnum(str_replace(array('/', '-', '_', '.'), '', $key))) return $this->get($key);
|
if(is_string($key) && strpos($key, '/') !== false && $this->sanitizer->pagePathName($key) === $key) return $this->get($key); // page path
|
||||||
return $this->find($key);
|
return $this->find($key); // selector string or array
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user