Fixing goals UI tests.

1 files changed, 4 insertions, 3 deletions

diff --git a/core/Plugin/Metric.php b/core/Plugin/Metric.php
index 06068df7e5..9200c0a607 100644
--- a/core/Plugin/Metric.php
+++ b/core/Plugin/Metric.php
@@ -91,7 +91,7 @@ abstract class Metric
      */
     public static function getMetric($row, $columnName, $mappingNameToId = null)
     {
-        if (empty($mappingIdToName)) {
+        if (empty($mappingNameToId)) {
             $mappingNameToId = Metrics::getMappingFromNameToId();
         }
 
@@ -104,10 +104,11 @@ abstract class Metric
             }
         } else {
             $value = @$row[$columnName];
-            if ($value === false
+            if ($value === null
                 && isset($mappingNameToId[$columnName])
             ) {
-                $value = $row[$mappingNameToId[$columnName]];
+                $columnName = $mappingNameToId[$columnName];
+                $value = @$row[$columnName];
             }
             return $value;
         }