From a042c9deccc50571452cf7c09e81a04625e45a06 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Wed, 26 Oct 2016 20:46:32 +1000
Subject: [PATCH] Followup 858978, fix failing tests

---
 src/core/qgsexpression.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
index e6a6f6a9ed4..4ba41dab4eb 100644
--- 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 )