diff --git a/ChangeLog b/ChangeLog index 37fc1254e..9f6a7b094 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-05-08 Loïc Chapeaux + * lang/english.inc.php3; lang/french.inc.php3; + libraries/build_dump.lib.php3: fixed bug #552486 - row count starts at 1? + 2002-05-07 Loïc Chapeaux * tbl_relation.php3; libraries/display_tbl.lib.php3: added backquotes and slashed some values. diff --git a/lang/english.inc.php3 b/lang/english.inc.php3 index b2870d9cb..0ae46426e 100644 --- a/lang/english.inc.php3 +++ b/lang/english.inc.php3 @@ -105,7 +105,7 @@ $strDrop = 'Drop'; $strDropDB = 'Drop database %s'; $strDropTable = 'Drop table'; $strDumpingData = 'Dumping data for table'; -$strDumpXRows = 'Dump %s rows starting at row %s.'; +$strDumpXRows = 'Dump %s row(s) starting at record # %s.'; $strDynamic = 'dynamic'; $strEdit = 'Edit'; @@ -267,7 +267,7 @@ $strRevokeMessage = 'You have revoked the privileges for %s'; $strRevokePriv = 'Revoke Privileges'; $strRowLength = 'Row length'; $strRows = 'Rows'; -$strRowsFrom = 'rows starting from'; +$strRowsFrom = 'row(s) starting from record #'; $strRowSize = ' Row size '; $strRowsModeHorizontal = 'horizontal'; $strRowsModeOptions = 'in %s mode and repeat headers after %s cells'; diff --git a/lang/french.inc.php3 b/lang/french.inc.php3 index 2ec1b6cba..12c8c94ca 100644 --- a/lang/french.inc.php3 +++ b/lang/french.inc.php3 @@ -105,7 +105,7 @@ $strDrop = 'Supprimer'; $strDropDB = 'Supprimer la base %s'; $strDropTable = 'Supprimer la table'; $strDumpingData = 'Contenu de la table'; -$strDumpXRows = 'Exporte %s enregistrements à partir du rang %s.'; +$strDumpXRows = 'Exporte %s enregistrement(s) à partir du rang n° %s.'; $strDynamic = 'dynamique'; $strEdit = 'Modifier'; @@ -267,7 +267,7 @@ $strRevokeMessage = 'Vous avez r $strRevokePriv = 'Révoquer les privilèges'; $strRowLength = 'Longueur enr.'; $strRows = 'Enregistrements'; -$strRowsFrom = 'lignes à partir de'; +$strRowsFrom = 'ligne(s) à partir de l\'enregistrement n°'; $strRowSize = ' Taille enr. '; $strRowsModeHorizontal= 'horizontal'; $strRowsModeOptions= 'en mode %s et répéter les en-têtes à chaque groupe de %s'; diff --git a/libraries/build_dump.lib.php3 b/libraries/build_dump.lib.php3 index 073625a48..a3412f5de 100644 --- a/libraries/build_dump.lib.php3 +++ b/libraries/build_dump.lib.php3 @@ -418,13 +418,10 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){ function PMA_getTableContent($db, $table, $limit_from = 0, $limit_to = 0, $handler, $error_url) { // Defines the offsets to use - if ($limit_from > 0) { - $limit_from--; - } else { - $limit_from = 0; - } if ($limit_to > 0 && $limit_from >= 0) { - $add_query = " LIMIT $limit_from, $limit_to"; + $add_query = ' LIMIT ' + . (($limit_from > 0) ? $limit_from . ', ' : '') + . $limit_to; } else { $add_query = ''; } @@ -494,13 +491,10 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){ } // Defines the offsets to use - if ($limit_from > 0) { - $limit_from--; - } else { - $limit_from = 0; - } if ($limit_to > 0 && $limit_from >= 0) { - $add_query = " LIMIT $limit_from, $limit_to"; + $add_query = ' LIMIT ' + . (($limit_from > 0) ? $limit_from . ', ' : '') + . $limit_to; } else { $add_query = ''; } @@ -581,13 +575,10 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){ mysql_free_result($result); // Defines the offsets to use - if ($limit_from > 0) { - $limit_from--; - } else { - $limit_from = 0; - } if ($limit_to > 0 && $limit_from >= 0) { - $add_query = " LIMIT $limit_from, $limit_to"; + $add_query = ' LIMIT ' + . (($limit_from > 0) ? $limit_from . ', ' : '') + . $limit_to; } else { $add_query = ''; }