Merge pull request #677 from simnandez/3.3

Fix: Pagination at bottom not work correctly with filters applied
This commit is contained in:
Laurent Destailleur 2013-02-21 12:44:56 -08:00
commit fbff66a907

View File

@ -442,18 +442,12 @@ else
$i++;
}
if ($num > $conf->liste_limit)
{
if ($sref || $snom || $sall || $sbarcode || GETPOST('search'))
{
print_barre_liste('', $page, "liste.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num);
}
else
{
print_barre_liste('', $page, "liste.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":"")."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num);
}
}
$param="&sref=".$sref.($sbarcode?"&sbarcode=".$sbarcode:"")."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy;
$param.=($fourn_id?"&fourn_id=".$fourn_id:"");
$param.=($search_categ?"&search_categ=".$search_categ:"");
$param.=isset($type)?"&type=".$type:"";
print_barre_liste('', $page, "liste.php", $param, $sortfield, $sortorder,'',$num);
$db->free($resql);
print "</table>";