Merge branch 'main' of git.ebene.ovh:ebene/radiantrh

This commit is contained in:
KONE SOREL 2026-01-03 12:53:29 +00:00
commit 19cdb50c00

View File

@ -2758,7 +2758,7 @@ class PHPExcel_Calculation {
// Loop through the formula extracting each operator and operand in turn // Loop through the formula extracting each operator and operand in turn
while(TRUE) { while(TRUE) {
//echo 'Assessing Expression '.substr($formula, $index),PHP_EOL; //echo 'Assessing Expression '.substr($formula, $index),PHP_EOL;
$opCharacter = $formula{$index}; // Get the first character of the value at the current index position $opCharacter = $formula[$index]; // Get the first character of the value at the current index position
//echo 'Initial character of expression block is '.$opCharacter,PHP_EOL; //echo 'Initial character of expression block is '.$opCharacter,PHP_EOL;
if ((isset(self::$_comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset(self::$_comparisonOperators[$formula{$index+1}]))) { if ((isset(self::$_comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset(self::$_comparisonOperators[$formula{$index+1}]))) {
$opCharacter .= $formula{++$index}; $opCharacter .= $formula{++$index};
@ -3036,11 +3036,11 @@ class PHPExcel_Calculation {
} }
} }
// Ignore white space // Ignore white space
while (($formula{$index} == "\n") || ($formula{$index} == "\r")) { while (($formula[$index] == "\n") || ($formula[$index] == "\r")) {
++$index; ++$index;
} }
if ($formula{$index} == ' ') { if ($formula[$index] == ' ') {
while ($formula{$index} == ' ') { while ($formula[$index] == ' ') {
++$index; ++$index;
} }
// If we're expecting an operator, but only have a space between the previous and next operands (and both are // If we're expecting an operator, but only have a space between the previous and next operands (and both are