From af4eaa6e5b017761cf2d33daa60994fca30c023b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Apr 2005 14:56:46 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Si=20on=20appelle=20plimit=20sans=20para?= =?UTF-8?q?m=E8tre,=20on=20prend=20la=20valeur=20par=20d=E9faut=20$conf->l?= =?UTF-8?q?iste=5Flimit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/lib/mysql.lib.php | 12 ++++-------- htdocs/lib/pgsql.lib.php | 14 +++++--------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/htdocs/lib/mysql.lib.php b/htdocs/lib/mysql.lib.php index 5e57c0a2946..917232ea671 100644 --- a/htdocs/lib/mysql.lib.php +++ b/htdocs/lib/mysql.lib.php @@ -409,14 +409,10 @@ class DoliDb function plimit($limit=0,$offset=0) { - if ($offset > 0) - { - return " LIMIT $offset,$limit "; - } - else - { - return " LIMIT $limit "; - } + global $conf; + if (! $limit) $limit=$conf->liste_limit; + if ($offset > 0) return " LIMIT $offset,$limit "; + else return " LIMIT $limit "; } diff --git a/htdocs/lib/pgsql.lib.php b/htdocs/lib/pgsql.lib.php index c857dec674a..59fe390bbbf 100644 --- a/htdocs/lib/pgsql.lib.php +++ b/htdocs/lib/pgsql.lib.php @@ -409,14 +409,10 @@ class DoliDb function plimit($limit=0,$offset=0) { - if ($offset > 0) - { - return " LIMIT $offset,$limit "; - } - else - { - return " LIMIT $limit "; - } + global $conf; + if (! $limit) $limit=$conf->liste_limit; + if ($offset > 0) return " LIMIT $offset,$limit "; + else return " LIMIT $limit "; } @@ -530,5 +526,5 @@ class DoliDb } } - + ?>