mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-08 15:47:00 +02:00
Code Issues Releases Wiki Activity

Report errors in get_rows()

Browse Source
This commit is contained in:
Jakub Vrana
2010-10-13 18:59:15 +02:00
parent 7e644b4346
commit 96544baf69
7 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
adminer/include/functions.inc.php
View File

@@ -135,10 +135,6 @@ function html_select($name, $options, $value = "", $onchange = true) {
return $return;
}
// other functions
/** Get INI boolean value
* @param string
* @return bool
@@ -192,7 +188,7 @@ function get_key_vals($query, $connection2 = null) {
* @param string
* @return array associative
*/
function get_rows($query, $connection2 = null) {
function get_rows($query, $connection2 = null, $error = "<p class='error'>") {
global $connection;
if (!is_object($connection2)) {
$connection2 = $connection;
@@ -203,6 +199,8 @@ function get_rows($query, $connection2 = null) {
while ($row = $result->fetch_assoc()) {
$return[] = $row;
}
} elseif ($error && (headers_sent() || ob_get_level())) {
echo $error . error() . "\n";
}
return $return;
}