alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Work Item 18415- mb_stripos empty delimiter

This commit is contained in:
Mark Baker 2012-07-27 22:06:28 +01:00
parent 8ab0200584
commit 8f3dc270a6
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Classes/PHPExcel/Calculation/TextData.php
View File

@ -239,9 +239,12 @@ class PHPExcel_Calculation_TextData {
$haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE(); $haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
} }
if (($offset > 0) && (strlen($haystack) > $offset)) { if (($offset > 0) && (PHPExcel_Shared_String::CountCharacters($haystack) > $offset)) {
if (PHPExcel_Shared_String::CountCharacters($needle) == 0) {
return $offset;
}
if (function_exists('mb_strpos')) { if (function_exists('mb_strpos')) {
$pos = mb_strpos($haystack, $needle, --$offset,'UTF-8'); $pos = mb_strpos($haystack, $needle, --$offset, 'UTF-8');
} else { } else {
$pos = strpos($haystack, $needle, --$offset); $pos = strpos($haystack, $needle, --$offset);
} }
@ -272,7 +275,10 @@ class PHPExcel_Calculation_TextData {
$haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE(); $haystack = ($haystack) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
} }
if (($offset > 0) && (strlen($haystack) > $offset)) { if (($offset > 0) && (PHPExcel_Shared_String::CountCharacters($haystack) > $offset)) {
if (PHPExcel_Shared_String::CountCharacters($needle) == 0) {
return $offset;
}
if (function_exists('mb_stripos')) { if (function_exists('mb_stripos')) {
$pos = mb_stripos($haystack, $needle, --$offset,'UTF-8'); $pos = mb_stripos($haystack, $needle, --$offset,'UTF-8');
} else { } else {

2
changelog.txt
View File

@ -92,7 +92,7 @@ Fixed in develop branch:
- Bugfix: (MBaker) Various fixes to Chart handling - Bugfix: (MBaker) Various fixes to Chart handling
- Bugfix: (MBaker) Work item 18370 - Error loading xlsx file with column breaks - Bugfix: (MBaker) Work item 18370 - Error loading xlsx file with column breaks
- Bugfix: (MBaker) OOCalc Reader now handles percentage and currency data types - Bugfix: (MBaker) OOCalc Reader now handles percentage and currency data types
- Bugfix: (MBaker) OOCalc Reader modified to process number-rows-repeated - Bugfix: (MBaker) Work Item 18415- mb_stripos empty delimiter
2012-05-19 (v1.7.7): 2012-05-19 (v1.7.7):

2
unitTests/rawTestData/Calculation/TextData/FIND.data
View File

@ -9,3 +9,5 @@
"k", "Mark Baker", 5, 8 "k", "Mark Baker", 5, 8
"a", "Mark Baker", 3, 7 "a", "Mark Baker", 3, 7
"BITE", "BIT", "#VALUE!" "BITE", "BIT", "#VALUE!"
"", "Mark Baker", 1
"", "Mark Baker", 8, 8