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

problem under MySQL 4.0.x with mysqli

Browse Source
This commit is contained in:
Marc Delisle
2005-10-14 14:36:15 +00:00
parent 1db66739f8
commit 1cda03955b
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-10-14 Marc Delisle <lem9@users.sourceforge.net>
* libraries/dbi/mysqli.dbi.lib.php: problem under MySQL 4.0.x
2005-10-14 Michal Čihař <michal@cihar.com> 2005-10-14 Michal Čihař <michal@cihar.com>
* libraries/sql_query_form.lib.php: Do not attempt to read upload dir when * libraries/sql_query_form.lib.php: Do not attempt to read upload dir when
not configured. not configured.

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

@@ -144,6 +144,11 @@ function PMA_mysqli_fetch_array($result, $type = FALSE) {
if ($num > 0) { if ($num > 0) {
$fields = PMA_DBI_get_fields_meta($result); $fields = PMA_DBI_get_fields_meta($result);
} }
// sometimes, mysqli_fetch_fields() does not return results
// (as seen in PHP 5.1.0-dev), so for now, return $data unchanged
if (!$fields) {
return $data;
}
$i = 0; $i = 0;
for ($i = 0; $i < $num; $i++) { for ($i = 0; $i < $num; $i++) {
if (!isset($fields[$i]->type)) { if (!isset($fields[$i]->type)) {