diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 14efd3bad62..4dd7669e549 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6451,7 +6451,7 @@ function print_barre_liste($title, $page, $file, $options = '', $sortfield = '',
print '
';
print ' ';
print ''.$title.''; // $title may contains HTML like a combo list from page consumption.php, so we do not use dolPrintLabel here()
- if (!empty($title) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
+ if (!empty($title) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '' && $totalnboflines > 0) {
print '('.$totalnboflines.')';
}
print ' | ';
@@ -6584,8 +6584,9 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
if (empty($hidenavigation)) {
if ((int) $limit > 0 && (empty($selectlimitsuffix) || !is_numeric($selectlimitsuffix))) {
$pagesizechoices = '10:10,15:15,20:20,25:25,50:50,100:100,250:250,500:500,1000:1000';
- $pagesizechoices .= ',5000:5000,10000:10000';
- //$pagesizechoices .= ',20000:20000'; // Memory trouble on browsers
+ $pagesizechoices .= ',5000:5000';
+ //$pagesizechoices .= ',10000:10000'; // Memory trouble on most browsers
+ //$pagesizechoices .= ',20000:20000'; // Memory trouble on most browsers
//$pagesizechoices .= ',0:'.$langs->trans("All"); // Not yet supported
//$pagesizechoices .= ',2:2';
if (getDolGlobalString('MAIN_PAGESIZE_CHOICES')) {
@@ -6603,11 +6604,11 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
$tmpchoice = explode(',', $pagesizechoices);
$tmpkey = $limit.':'.$limit;
if (!in_array($tmpkey, $tmpchoice)) {
- $tmpchoice[] = $tmpkey;
+ $tmpchoice[$tmpkey] = $tmpkey;
}
$tmpkey = $conf->liste_limit.':'.$conf->liste_limit;
if (!in_array($tmpkey, $tmpchoice)) {
- $tmpchoice[] = $tmpkey;
+ $tmpchoice[$tmpkey] = $tmpkey;
}
asort($tmpchoice, SORT_NUMERIC);
foreach ($tmpchoice as $val) {