IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-03 20:20:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

#193

Browse Source
This commit is contained in:
James Cole 2016-02-25 15:02:05 +01:00
parent 69a8cad47b
commit 9b23cbd2c2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/CsvController.php
View File

@ -417,7 +417,9 @@ class CsvController extends Controller
$settings['roles'] = [];
if ($request->hasFile('csv_config')) { // Process config file if present.
$data = file_get_contents($request->file('csv_config')->getRealPath());
$size = $request->file('csv_config')->getSize();
$data = $request->file('csv_config')->openFile()->fread($size);
$json = json_decode($data, true);
if (is_array($json)) {
$settings = array_merge($settings, $json);