parsecsv/parsecsv-for-php
1
0
Fork 0
mirror of https://github.com/parsecsv/parsecsv-for-php.git synced 2026-02-19 08:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

load_data

Browse Source
This commit is contained in:
William Knauss
2014-06-05 20:46:29 -04:00
parent 8af4d1e513
commit 33825514d9
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
parsecsv.lib.php
View File

@@ -884,30 +884,30 @@ class parseCSV {
$data = null;
$file = null;
if ( $input === null ) {
if (is_null($input)) {
$file = $this->file;
}
elseif ( file_exists($input) ) {
elseif (file_exists($input)) {
$file = $input;
}
else {
$data = $input;
}
if ( !empty($data) || $data = $this->_rfile($file) ) {
if ( $this->file != $file ) {
if (!empty($data) || $data = $this->_rfile($file)) {
if ($this->file != $file) {
$this->file = $file;
}
if ( preg_match('/\.php$/i', $file) && preg_match('/<\?.*?\?>(.*)/ims', $data, $strip) ) {
if (preg_match('/\.php$/i', $file) && preg_match('/<\?.*?\?>(.*)/ims', $data, $strip)) {
$data = ltrim($strip[1]);
}
if ( $this->convert_encoding ) {
if ($this->convert_encoding) {
$data = iconv($this->input_encoding, $this->output_encoding, $data);
}
if ( substr($data, -1) != "\n" ) {
if (substr($data, -1) != "\n") {
$data .= "\n";
}