avoid php errors if result set is FALSE
This commit is contained in:
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
|
|||||||
$Id$
|
$Id$
|
||||||
$Source$
|
$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>
|
2004-07-12 Marc Delisle <lem9@users.sourceforge.net>
|
||||||
* all themes/colors.inc.php, libraries/common.lib.php,
|
* all themes/colors.inc.php, libraries/common.lib.php,
|
||||||
config.inc.php, Documentation.html: rename colors.inc.php to
|
config.inc.php, Documentation.html: rename colors.inc.php to
|
||||||
|
@@ -123,9 +123,9 @@ function PMA_mysqli_fetch_array($result, $type = FALSE) {
|
|||||||
global $cfg, $allow_recoding, $charset, $convcharset;
|
global $cfg, $allow_recoding, $charset, $convcharset;
|
||||||
|
|
||||||
if ($type != FALSE) {
|
if ($type != FALSE) {
|
||||||
$data = mysqli_fetch_array($result, $type);
|
$data = @mysqli_fetch_array($result, $type);
|
||||||
} else {
|
} else {
|
||||||
$data = mysqli_fetch_array($result);
|
$data = @mysqli_fetch_array($result);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* No data returned => do not touch it */
|
/* No data returned => do not touch it */
|
||||||
|
Reference in New Issue
Block a user