diff --git a/lib/Db/MagicMapper/MagicRbacHandler.php b/lib/Db/MagicMapper/MagicRbacHandler.php index 502ec45c5a..af593e94f9 100644 --- a/lib/Db/MagicMapper/MagicRbacHandler.php +++ b/lib/Db/MagicMapper/MagicRbacHandler.php @@ -1261,8 +1261,15 @@ private function buildComparisonOperatorConditionSql( return null; } - $sqlOperator = $comparisonMap[$operator]; - $quotedValue = $this->quoteValue(value: $operand); + $sqlOperator = $comparisonMap[$operator]; + $resolvedOperand = $this->resolveDynamicValue(value: $operand); + + // If dynamic variable resolved to null, this condition cannot be met. + if ($operand !== $resolvedOperand && $resolvedOperand === null) { + return null; + } + + $quotedValue = $this->quoteValue(value: $resolvedOperand); return "{$columnName} {$sqlOperator} {$quotedValue}"; }//end buildComparisonOperatorConditionSql()