From ce3fe0d46029ec6da38f07c01787d0c0ff03e470 Mon Sep 17 00:00:00 2001
From: nikrou <nikrou@piwigo.org>
Date: Sat, 21 Nov 2009 19:52:50 +0000
Subject: Feature 1255 : limit params in sql queries were in wrong order (LIMIT
 count OFFSET offset)

git-svn-id: http://piwigo.org/svn/trunk@4334 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/cat_perm.php                      | 2 +-
 admin/element_set_global.php            | 4 +---
 admin/element_set_unit.php              | 2 +-
 admin/include/functions.php             | 2 +-
 admin/include/functions_history.inc.php | 2 +-
 admin/rating.php                        | 2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'admin')

diff --git a/admin/cat_perm.php b/admin/cat_perm.php
index 5ef886e1d..79d329115 100644
--- a/admin/cat_perm.php
+++ b/admin/cat_perm.php
@@ -59,7 +59,7 @@ if (!isset($page['cat']))
 SELECT id
   FROM '.CATEGORIES_TABLE.'
   WHERE status = \'private\'
-  LIMIT 0 OFFSET 1
+  LIMIT 1
 ;';
 
   list($page['cat']) = pwg_db_fetch_row(pwg_query($query));
diff --git a/admin/element_set_global.php b/admin/element_set_global.php
index 79e78e8a2..2b7b728ac 100644
--- a/admin/element_set_global.php
+++ b/admin/element_set_global.php
@@ -474,13 +474,11 @@ SELECT id,path,tn_ext,file,filesize,level
   FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', $page['cat_elements_id']).')
   '.$conf['order_by'].'
-  LIMIT '.$page['start'].' OFFSET '.$page['nb_images'].'
+  LIMIT '.$page['nb_images'].' OFFSET '.$page['start'].'
 ;';
-  //echo '<pre>'.$query.'</pre>';
   $result = pwg_query($query);
 
   // template thumbnail initialization
-
   while ($row = pwg_db_fetch_assoc($result))
   {
     $src = get_thumbnail_url($row);
diff --git a/admin/element_set_unit.php b/admin/element_set_unit.php
index cf5409296..9abcb3889 100644
--- a/admin/element_set_unit.php
+++ b/admin/element_set_unit.php
@@ -196,7 +196,7 @@ SELECT id,path,tn_ext,name,date_creation,comment,author,file
   FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', $page['cat_elements_id']).')
   '.$conf['order_by'].'
-  LIMIT '.$page['start'].' OFFSET '.$page['nb_images'].'
+  LIMIT '.$page['nb_images'].' OFFSET '.$page['start'].'
 ;';
   $result = pwg_query($query);
 
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 16928e9ab..b0d5da945 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -597,7 +597,7 @@ SELECT image_id
   FROM '.IMAGE_CATEGORY_TABLE.'
   WHERE category_id = '.$category_id.'
   ORDER BY '.DB_RANDOM_FUNCTION.'()
-  LIMIT 0 OFFSET 1
+  LIMIT 1
 ;';
     list($representative) = pwg_db_fetch_row(pwg_query($query));
 
diff --git a/admin/include/functions_history.inc.php b/admin/include/functions_history.inc.php
index 38d3950eb..298c6937c 100644
--- a/admin/include/functions_history.inc.php
+++ b/admin/include/functions_history.inc.php
@@ -161,7 +161,7 @@ SELECT
   WHERE '.$where_separator.'
 ;';
 
-  // LIMIT '.$page['start'].' OFFSET '.$conf['nb_logs_page'].'
+  // LIMIT '.$conf['nb_logs_page'].' OFFSET '.$page['start'].'
 
   $result = pwg_query($query);
 
diff --git a/admin/rating.php b/admin/rating.php
index e5fe48d03..da44b4c1c 100644
--- a/admin/rating.php
+++ b/admin/rating.php
@@ -176,7 +176,7 @@ SELECT i.id,
   WHERE 1 = 1 ' . $page['user_filter'] . '
   GROUP BY r.element_id
   ORDER BY ' . $available_order_by[$order_by_index][1] .'
-  LIMIT '.$start.' OFFSET '.$elements_per_page.'
+  LIMIT '.$elements_per_page.' OFFSET '.$start.'
 ;';
 
 $images = array();
-- 
cgit v1.2.3