@@ -48,16 +48,14 @@ discard block |
||
| 48 | 48 | $rows = [$header]; |
| 49 | 49 | |
| 50 | 50 | $data = self::$exportDataAsDisplayed ? |
| 51 | - self::$data : |
|
| 52 | - self::select(self::$t['q']); |
|
| 51 | + self::$data : self::select(self::$t['q']); |
|
| 53 | 52 | |
| 54 | 53 | if (count($data) > 0) { |
| 55 | 54 | foreach ($data as $row) { |
| 56 | 55 | $cells = []; |
| 57 | - foreach($columns as $column){ |
|
| 56 | + foreach ($columns as $column) { |
|
| 58 | 57 | $cells[] = is_array($row[$column]) ? |
| 59 | - $row[$column][0] : |
|
| 60 | - $row[$column]; |
|
| 58 | + $row[$column][0] : $row[$column]; |
|
| 61 | 59 | } |
| 62 | 60 | $rows[] = $cells; |
| 63 | 61 | } |
@@ -95,8 +93,7 @@ discard block |
||
| 95 | 93 | if (($output = fopen('php://output', 'w'))) { |
| 96 | 94 | foreach ($eData as $v) { |
| 97 | 95 | self::$export === 'CSV' ? |
| 98 | - fputcsv($output, $v) : |
|
| 99 | - fputs($output, implode("\t", array_map($escape, $v)) . "\r\n"); |
|
| 96 | + fputcsv($output, $v) : fputs($output, implode("\t", array_map($escape, $v)) . "\r\n"); |
|
| 100 | 97 | } |
| 101 | 98 | fclose($output); |
| 102 | 99 | } |