Merge pull request #1585 from FHenry/3.5

"or" into if instead of ||
This commit is contained in:
Laurent Destailleur
2014-05-10 15:44:25 +02:00

View File

@@ -2547,7 +2547,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
if ($picto == 'setup') $picto='title.png'; if ($picto == 'setup') $picto='title.png';
if (!empty($conf->browser->ie) && $picto=='title.png') $picto='title.gif'; if (!empty($conf->browser->ie) && $picto=='title.png') $picto='title.gif';
if ($num > $conf->liste_limit or $num == -1) if (($num > $conf->liste_limit) || ($num == -1))
{ {
$nextpage = 1; $nextpage = 1;
} }