From 5b04992f41da5e0bcaf4453ccdd1fcc7584774c4 Mon Sep 17 00:00:00 2001 From: frozenstupidity Date: Wed, 13 Aug 2014 11:31:15 +0200 Subject: [PATCH] Fix invalid NA return in VLOOKUP The VLOOKUP function required the lookup value to be the same type as the return value which has been corrected. Optimized variable usage --- Classes/PHPExcel/Calculation/LookupRef.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Classes/PHPExcel/Calculation/LookupRef.php b/Classes/PHPExcel/Calculation/LookupRef.php index 94f42e5f2..75e7f69ce 100644 --- a/Classes/PHPExcel/Calculation/LookupRef.php +++ b/Classes/PHPExcel/Calculation/LookupRef.php @@ -735,11 +735,7 @@ public static function VLOOKUP($lookup_value, $lookup_array, $index_number, $not return PHPExcel_Calculation_Functions::NA(); } else { // otherwise return the appropriate value - $result = $lookup_array[$rowNumber][$returnColumn]; - if ((is_numeric($lookup_value) && is_numeric($result)) || - (!is_numeric($lookup_value) && !is_numeric($result))) { - return $result; - } + return $lookup_array[$rowNumber][$returnColumn]; } } @@ -802,8 +798,7 @@ public static function HLOOKUP($lookup_value, $lookup_array, $index_number, $not return PHPExcel_Calculation_Functions::NA(); } else { // otherwise return the appropriate value - $result = $lookup_array[$returnColumn][$rowNumber]; - return $result; + return $lookup_array[$returnColumn][$rowNumber]; } }