Commit 9deecc74 authored by metzlerd's avatar metzlerd
Browse files

Merge branch '7.x-3.x' into 7.x-4.x

parents 3ac216f9 001213bd
...@@ -48,10 +48,8 @@ class FrxDrupal extends FrxDataSource { ...@@ -48,10 +48,8 @@ class FrxDrupal extends FrxDataSource {
$select_fields = array(); $select_fields = array();
$rownum = 0; $rownum = 0;
$xml = new SimpleXMLElement('<table/>'); $xml = new SimpleXMLElement('<table/>');
foreach ($rs as $data) { if ($rs && $rs->columnCount()) foreach ($rs as $data) {
$rownum++; $rownum++;
$row_node = $xml->addChild('row'); $row_node = $xml->addChild('row');
$row_node['num'] = $rownum; $row_node['num'] = $rownum;
......
...@@ -87,12 +87,11 @@ class FrxPDO extends FrxDataSource { ...@@ -87,12 +87,11 @@ class FrxPDO extends FrxDataSource {
$i = $db->errorInfo(); $i = $db->errorInfo();
FrxReportGenerator::instance()->error($i[2] . ':' . $sql, $i[2]); FrxReportGenerator::instance()->error($i[2] . ':' . $sql, $i[2]);
} }
else { else if ($rs && $rs->columnCount()) {
//$rs->debugDumpParams();
$data = $rs->fetchAll(PDO::FETCH_ASSOC); $data = $rs->fetchAll(PDO::FETCH_ASSOC);
$rownum = 0; $rownum = 0;
foreach ($data as $row) { if ($data) foreach ($data as $row) {
$rownum++; $rownum++;
$row_node = $xml->addChild('row'); $row_node = $xml->addChild('row');
$row_node['num'] = $rownum; $row_node['num'] = $rownum;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment