nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid php errors if result set is FALSE

Browse Source
This commit is contained in:
Alexander M. Turek
2004-07-13 14:40:34 +00:00
parent ed3eaa7449
commit 258f543379
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-07-13 Alexander M. Turek <me@derrabus.de>
* libraries/dbi/mysqli.dbi.lib.php: avoid php errors if result set is
FALSE.
2004-07-12 Marc Delisle <lem9@users.sourceforge.net>
* all themes/colors.inc.php, libraries/common.lib.php,
config.inc.php, Documentation.html: rename colors.inc.php to

4
libraries/dbi/mysqli.dbi.lib.php
View File

@@ -123,9 +123,9 @@ function PMA_mysqli_fetch_array($result, $type = FALSE) {
global $cfg, $allow_recoding, $charset, $convcharset;
if ($type != FALSE) {
$data = mysqli_fetch_array($result, $type);
$data = @mysqli_fetch_array($result, $type);
} else {
$data = mysqli_fetch_array($result);
$data = @mysqli_fetch_array($result);
}
/* No data returned => do not touch it */