tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8901 from ian-patel/4.2

Browse Source 
Fix Undefined variable: result when catch Exception
This commit is contained in:
Robbie Averill 2019-04-05 11:53:25 +13:00 committed by GitHub
commit 3771841dd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Dev/CsvBulkLoader.php
View File

@ -70,6 +70,8 @@ class CsvBulkLoader extends BulkLoader
$previousDetectLE = ini_get('auto_detect_line_endings');
ini_set('auto_detect_line_endings', true);
$result = BulkLoader_Result::create();
try {
$filepath = Director::getAbsFile($filepath);
$csvReader = Reader::createFromPath($filepath, 'r');
@ -111,8 +113,6 @@ class CsvBulkLoader extends BulkLoader
$rows = $csvReader->fetchAssoc($headerMap, $remapper);
}
$result = BulkLoader_Result::create();
foreach ($rows as $row) {
$this->processRecord($row, $this->columnMap, $result, $preview);
}