Rule-based labeling: Fix issue with filters not working

wonder-sk · wonder-sk · commit ee6a7d0d603d · 2015-09-24T18:02:27.000+08:00
diff --git a/src/core/qgsrulebasedlabeling.cpp b/src/core/qgsrulebasedlabeling.cpp
@@ -229,7 +229,10 @@ void QgsRuleBasedLabeling::Rule::prepare( const QgsRenderContext& context, QStri
   }
 
   if ( mFilter )
+  {
+    attributeNames << mFilter->referencedColumns();
     mFilter->prepare( &context.expressionContext() );
+  }
 
   // call recursively
   Q_FOREACH ( Rule* rule, mChildren )

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,10 @@ void QgsRuleBasedLabeling::Rule::prepare( const QgsRenderContext& context, QStri`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`if ( mFilter )`
	`232`	`+ {`
	`233`	`+ attributeNames << mFilter->referencedColumns();`
`232`	`234`	`mFilter->prepare( &context.expressionContext() );`
	`235`	`+ }`
`233`	`236`
`234`	`237`	`// call recursively`
`235`	`238`	`Q_FOREACH ( Rule* rule, mChildren )`