Skip to content

Commit

Permalink
Ability to set the encoding for ExcelFile, fixes #617
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickbrouwers committed Dec 10, 2015
1 parent e10e743 commit e0a5afc
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/Maatwebsite/Excel/Files/ExcelFile.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ abstract class ExcelFile extends File {
*/
protected $enclosure;

/**
* @var null
*/
protected $encoding = null;

/**
* @param Application $app
* @param Excel $excel
Expand Down Expand Up @@ -83,7 +88,9 @@ public function loadFile()

// Load the file
$file = $this->excel->load(
$this->getFile()
$this->getFile(),
null,
$this->encoding
);

return $file;
Expand Down

0 comments on commit e0a5afc

Please sign in to comment.