From 7b8533a5045fbcb08e0563d400317783c679948f Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Sat, 13 Oct 2012 22:07:36 +0100 Subject: [PATCH] Minor bugfix to calculation engine formula validation (unbalanced braces) --- Classes/PHPExcel/Calculation.php | 2 +- changelog.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Classes/PHPExcel/Calculation.php b/Classes/PHPExcel/Calculation.php index 385d192..2fc63e5 100644 --- a/Classes/PHPExcel/Calculation.php +++ b/Classes/PHPExcel/Calculation.php @@ -2977,7 +2977,7 @@ class PHPExcel_Calculation { } while (($op = $stack->pop()) !== NULL) { // pop everything off the stack and push onto output - if ((is_array($opCharacter) && $opCharacter['value'] == '(') || ($opCharacter === '(')) + if ((is_array($op) && $op['value'] == '(') || ($op === '(')) return $this->_raiseFormulaError("Formula Error: Expecting ')'"); // if there are any opening braces on the stack, then braces were unbalanced $output[] = $op; } diff --git a/changelog.txt b/changelog.txt index 1c4733d..de9b0cf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -72,6 +72,9 @@ The following methods will be changed in version 1.7.9 Fixed in develop branch: + + +2012-10-12 (v1.7.8): - Special: (kkamkou) Phar builder script to add phar file as a distribution option - Feature: (MBaker) Refactor PDF Writer to allow use with a choice of PDF Rendering library rather than restricting to tcPDF