From 60a13d6517adb9a9eae4b2766e76954965f9f01c Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Mon, 7 Oct 2013 09:46:24 -0600
Subject: [PATCH] Always provide lib functions, conditionally provide scope

---
 src/ol/expr/expression.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/ol/expr/expression.js b/src/ol/expr/expression.js
index baa9eacf22..3e8103885d 100644
--- a/src/ol/expr/expression.js
+++ b/src/ol/expr/expression.js
@@ -21,14 +21,11 @@ goog.require('ol.geom.GeometryType');
  * @return {*} The result of the expression.
  */
 ol.expr.evaluateFeature = function(expr, opt_feature) {
-  var result;
+  var scope;
   if (goog.isDef(opt_feature)) {
-    result = expr.evaluate(
-        opt_feature.getAttributes(), ol.expr.lib, opt_feature);
-  } else {
-    result = expr.evaluate();
+    scope = opt_feature.getAttributes();
   }
-  return result;
+  return expr.evaluate(scope, ol.expr.lib, opt_feature);
 };