Skip to content

Commit

Permalink
bugfix: Was not handeling errors correctly
Browse files Browse the repository at this point in the history
thanks to Igor Degraf for the patch
  • Loading branch information
Slim Amamou committed Apr 25, 2019
1 parent 4472db1 commit 7e25ec3
Showing 1 changed file with 12 additions and 15 deletions.
27 changes: 12 additions & 15 deletions syntax.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,30 +115,27 @@ function render($mode, Doku_Renderer $renderer, $data) {
$this->vertical_position = FALSE;
}
if ($data['urn'] != "") {
$db =& DB::connect($data['urn']);
if (DB::isError($db)) {
$error = $db->getMessage();
$renderer->doc .= '<div class="error">'. $error .'</div>';
try {
$db =& DB::connect($data['urn']);
} catch(Exception $e) {
$error = $e->getMessage();
$renderer->doc .= '<div class="error">Plugin SQL Error '. $error .'</div>';
return TRUE;
}
else {
array_push($this->databases, $db);
}
array_push($this->databases, $db);
}
elseif (!empty($data['sql'])) {
$db =& array_pop($this->databases);
if (!empty($db)) {
foreach ($data['sql'] as $query) {
$db->setFetchMode(DB_FETCHMODE_ASSOC);
$result =& $db->getAll($query);
if (DB::isError($result)) {
$error = $result->getMessage();
$renderer->doc .= '<div class="error">'. $error .'</div>';
try {
$result =& $db->getAll($query);
} catch(Exception $e) {
$error = $e->getMessage();
$renderer->doc .= '<div class="error">Plugin SQL Error '. $error .'</div>';
return TRUE;
}
elseif ($result == DB_OK or empty($result)) {
}
else {

if (! $this->vertical_position) {
if ($this->display_inline) {
Expand Down Expand Up @@ -168,6 +165,7 @@ function render($mode, Doku_Renderer $renderer, $data) {
}
$renderer->doc .= '</td>';
}
$renderer->doc .= '</td>';
$renderer->doc .= '</tr>';
}
$renderer->doc .= '</tbody></table>';
Expand All @@ -189,7 +187,6 @@ function render($mode, Doku_Renderer $renderer, $data) {
$renderer->doc .= '</tbody></table>';
}
}
}
}
}
}
Expand Down

0 comments on commit 7e25ec3

Please sign in to comment.