Followup 858978, fix failing tests

nyalldawson · nyalldawson · commit a042c9deccc5 · 2016-10-26T20:46:32.000+10:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -4963,7 +4963,7 @@ QVariant QgsExpression::NodeColumnRef::eval( QgsExpression *parent, const QgsExp
     }
   }
 
-  if ( context && context->feature().isValid() )
+  if ( context && context->hasVariable( QgsExpressionContext::EXPR_FEATURE ) )
   {
     QgsFeature feature = context->feature();
     if ( index >= 0 )

Original file line number	Diff line number	Diff line change
`@@ -4963,7 +4963,7 @@ QVariant QgsExpression::NodeColumnRef::eval( QgsExpression *parent, const QgsExp`
`4963`	`4963`	`}`
`4964`	`4964`	`}`
`4965`	`4965`
`4966`		`- if ( context && context->feature().isValid() )`
	`4966`	`+ if ( context && context->hasVariable( QgsExpressionContext::EXPR_FEATURE ) )`
`4967`	`4967`	`{`
`4968`	`4968`	`QgsFeature feature = context->feature();`
`4969`	`4969`	`if ( index >= 0 )`