Followup cc6b1e3: also respect subexp vars in presence of filter

m-kuhn · m-kuhn · commit 7d2098cdf4f7 · 2016-10-31T15:18:56.000+01:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -3683,7 +3683,7 @@ const QList<QgsExpression::Function*>& QgsExpression::Functions()
       if ( node->args()->count() > 3 )
       {
         QgsExpression::Node* filterNode = node->args()->at( 3 );
-        referencedVars = filterNode->referencedVariables();
+        referencedVars.unite( filterNode->referencedVariables() );
       }
       return referencedVars.contains( "parent" ) || referencedVars.contains( QString() );
     },

Original file line number	Diff line number	Diff line change
`@@ -3683,7 +3683,7 @@ const QList<QgsExpression::Function*>& QgsExpression::Functions()`
`3683`	`3683`	`if ( node->args()->count() > 3 )`
`3684`	`3684`	`{`
`3685`	`3685`	`QgsExpression::Node* filterNode = node->args()->at( 3 );`
`3686`		`- referencedVars = filterNode->referencedVariables();`
	`3686`	`+ referencedVars.unite( filterNode->referencedVariables() );`
`3687`	`3687`	`}`
`3688`	`3688`	`return referencedVars.contains( "parent" ) \|\| referencedVars.contains( QString() );`
`3689`	`3689`	`},`