diff --git a/ChangeLog b/ChangeLog
index fdc6e3266..3ecbbeda6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ $Source$
 2004-01-25 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_row_delete.php: bug 882695, broken row highlighting
     * libraries/display_tbl.lib.php: bug 879792, bad sort link
+    * libraries/dbi/*: PMA_DBI_num_fields()
 
 2004-01-24 Marc Delisle  <lem9@users.sourceforge.net>
     * querywindow.php: PMA_DBI_close() instead of DBI_close()
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index 13418e551..fa76cd11d 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -232,4 +232,8 @@ function PMA_DBI_get_fields_meta($result) {
     return $fields;
 }
 
+function PMA_DBI_num_fields($result) {
+    return mysql_num_fields($result);
+}
+
 ?>
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index be2d00303..6cf185865 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -213,4 +213,8 @@ function PMA_DBI_get_fields_meta($result) {
     return mysqli_fetch_fields($result);
 }
 
+function PMA_DBI_num_fields($result) {
+    return mysqli_num_fields($result);
+}
+
 ?>
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index 3df88f2fb..a0a3d8f80 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -120,7 +120,7 @@ function PMA_exportDBCreate($db) {
 function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
     $result      = PMA_mysql_query($sql_query) or PMA_mysqlDie('', $sql_query, '', $error_url);
 
-    $columns_cnt = mysql_num_fields($result);
+    $columns_cnt = PMA_DBI_num_fields($result);
     for ($i = 0; $i < $columns_cnt; $i++) {
         $columns[$i] = mysql_field_name($result, $i);
     }