From 399318d264bab6a08cf2ea87a1b6d17ddcd2722d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 9 Mar 2004 14:21:31 +0000 Subject: [PATCH] Fix PMA_mysql_fetch_array return value for last result (bug #905223). --- ChangeLog | 2 ++ libraries/dbi/mysql.dbi.lib.php | 4 ++++ libraries/dbi/mysqli.dbi.lib.php | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1c1a96bb3..d1a3b3525 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ $Source$ 2004-03-09 Michal Cihar * libraries/dbi/mysql.dbi.lib.php: Remove possible double charset conversion. + * libraries/dbi/mysql.dbi.lib.php, libraries/dbi/mysqli.dbi.lib.php: Fix + PMA_mysql_fetch_array return value for last result (bug #905223). 2004-03-05 Marc Delisle * libraries/sqlparser.lib.php: bug 909752, floating point digit diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 4bc89e2aa..f1b003bff 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -132,6 +132,10 @@ function PMA_mysql_fetch_array($result, $type = FALSE) { } else { $data = mysql_fetch_array($result); } + + /* No data returned => do not touch it */ + if (! $data) return $data; + if (PMA_MYSQL_INT_VERSION >= 40100 || !(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) { /* No recoding -> return data as we got them */ diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 075f64411..050cfe0bf 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -121,6 +121,10 @@ function PMA_mysqli_fetch_array($result, $type = FALSE) { } else { $data = mysqli_fetch_array($result); } + + /* No data returned => do not touch it */ + if (! $data) return $data; + if (PMA_MYSQL_INT_VERSION >= 40100 || !(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) { /* No recoding -> return data as we got them */ @@ -224,4 +228,4 @@ function PMA_DBI_num_fields($result) { return mysqli_num_fields($result); } -?> \ No newline at end of file +?>