tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix PHP Fatal error "Method Icinga\File\Csv::__toString() must not throw an exception in /vagrant/test/php/library/Icinga/File/CsvTest.php on line 35"" 

This reverts commit f2fdd7f39df759ff27c9c133f40bbcae14820708.
This commit is contained in:
Alexander Klimov 2014-06-27 12:31:09 +02:00
parent 22e13ce282
commit 4b72e1b54f
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
library/Icinga/File/Csv.php
View File

@ -5,7 +5,6 @@
namespace Icinga\File;
use Icinga\Data\Browsable;
use Exception;
class Csv
{
@ -28,24 +27,20 @@ class Csv
public function __toString()
{
try {
$first = true;
$csv = '';
foreach ($this->query->getQuery()->fetchAll() as $row) {
if ($first) {
$csv .= implode(',', array_keys((array) $row)) . "\r\n";
$first = false;
}
$out = array();
foreach ($row as & $val) {
$out[] = '"' . $val . '"';
}
$csv .= implode(',', $out) . "\r\n";
$first = true;
$csv = '';
foreach ($this->query->getQuery()->fetchAll() as $row) {
if ($first) {
$csv .= implode(',', array_keys((array) $row)) . "\r\n";
$first = false;
}
return $csv;
} catch (Exception $e) {
return (string) $e;
$out = array();
foreach ($row as & $val) {
$out[] = '"' . $val . '"';
}
$csv .= implode(',', $out) . "\r\n";
}
return $csv;
}
}