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

Attempt fix for issue mentioned by @Rayden in processwire/processwire-issues#1207

Browse Source
This commit is contained in:
Ryan Cramer
2020-07-09 11:06:19 -04:00
parent f095f4aa77
commit f7879126da
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wire/modules/Fieldtype/FieldtypeFile.module
View File

@@ -771,7 +771,7 @@ class FieldtypeFile extends FieldtypeMulti implements ConfigurableModule {
/** /**
* Get match query * Get match query
* *
* @param DatabaseQuerySelect $query * @param DatabaseQuerySelect|PageFinderDatabaseQuerySelect $query
* @param string $table * @param string $table
* @param string $subfield * @param string $subfield
* @param string $operator * @param string $operator
@@ -789,6 +789,7 @@ class FieldtypeFile extends FieldtypeMulti implements ConfigurableModule {
$isFindOperator = $compareType & Selector::compareTypeFind; $isFindOperator = $compareType & Selector::compareTypeFind;
$isInvalidOperator = false; $isInvalidOperator = false;
$isInvalidSubfield = false; $isInvalidSubfield = false;
$originalOperator = $operator;
unset($schema['keys'], $schema['xtra']); unset($schema['keys'], $schema['xtra']);
@@ -839,6 +840,12 @@ class FieldtypeFile extends FieldtypeMulti implements ConfigurableModule {
} }
} }
if($operator !== $originalOperator) {
// operator can change above (i.e. getMatchQuerySubfield)
$compareType = Selectors::getOperators(array('getValueType' => 'compareType', 'operator' => $operator));
$isFindOperator = $compareType & Selector::compareTypeFind;
}
if($isInvalidSubfield) { if($isInvalidSubfield) {
throw new PageFinderSyntaxException("Property '$subfield' not recognized in: $query->selector"); throw new PageFinderSyntaxException("Property '$subfield' not recognized in: $query->selector");