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

Add descriptive error message when trying to use OR values with path/URL and core PathPaths module is not installed, per processwire/processwire-issues#504

Browse Source
This commit is contained in:
Ryan Cramer
2018-02-26 06:27:29 -05:00
parent 869040bb30
commit 37f95199f4
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wire/core/PageFinder.php
View File

@@ -1848,6 +1848,7 @@ class PageFinder extends Wire {
foreach($this->wire('languages') as $language) { foreach($this->wire('languages') as $language) {
if(!$language->isDefault()) $langNames[$language->id] = "name" . (int) $language->id; if(!$language->isDefault()) $langNames[$language->id] = "name" . (int) $language->id;
} }
if(!count($langNames)) $langNames = null;
} else { } else {
$langNames = null; $langNames = null;
} }
@@ -1869,6 +1870,14 @@ class PageFinder extends Wire {
$query->where("pages.id=1"); $query->where("pages.id=1");
} else { } else {
$selectorValue = $selector->value; $selectorValue = $selector->value;
if(is_array($selectorValue)) {
// only the PagePaths module can perform OR value searches on path/url
if($langNames) {
throw new PageFinderSyntaxException("OR values not supported for multi-language 'path' or 'url'");
} else {
throw new PageFinderSyntaxException("OR value support of 'path' or 'url' requires core PagePaths module");
}
}
if($langNames) $selectorValue = $this->wire('modules')->get('LanguageSupportPageNames')->updatePath($selectorValue); if($langNames) $selectorValue = $this->wire('modules')->get('LanguageSupportPageNames')->updatePath($selectorValue);
$parts = explode('/', rtrim($selectorValue, '/')); $parts = explode('/', rtrim($selectorValue, '/'));
$part = $database->escapeStr($this->wire('sanitizer')->pageName(array_pop($parts), Sanitizer::toAscii)); $part = $database->escapeStr($this->wire('sanitizer')->pageName(array_pop($parts), Sanitizer::toAscii));