Changeset 4334 for trunk/include

Timestamp:

Nov 21, 2009, 8:52:50 PM (14 years ago)

Author:

nikrou

Message:

Feature 1255 : limit params in sql queries were in wrong order (LIMIT count OFFSET offset)

Location:

trunk/include

Files:

• calendar_monthly.class.php (modified) (1 diff)
• category_cats.inc.php (modified) (2 diffs)
• functions_notification.inc.php (modified) (3 diffs)
• functions_tag.inc.php (modified) (1 diff)
• section_init.inc.php (modified) (2 diffs)
• ws_functions.inc.php (modified) (3 diffs)

trunk/include/calendar_monthly.class.php

@@ -349 +349 @@
     $query.= '
   ORDER BY RAND()
-  LIMIT 0 OFFSET 1';
+  LIMIT 1';
     unset ( $page['chronology_date'][CDAY] );
 

trunk/include/category_cats.inc.php

@@ -106 +106 @@
     ).'
   ORDER BY RAND()
-  LIMIT 0,1
+  LIMIT 1
 ;';
       $subresult = pwg_query($query);
@@ -134 +134 @@
     ).'
     ORDER BY RAND()
-    LIMIT 0,1
+    LIMIT 1
   ;';
       $subresult = pwg_query($query);

trunk/include/functions_notification.inc.php

@@ -445 +445 @@
   GROUP BY date_available
   ORDER BY date_available DESC
-  LIMIT 0 OFFSET '.$max_dates.'
+  LIMIT '.$max_dates.'
 ;';
   $result = pwg_query($query);
@@ -465 +465 @@
     AND tn_ext IS NOT NULL
   ORDER BY RAND(NOW())
-  LIMIT 0 OFFSET '.$max_elements.'
+  LIMIT '.$max_elements.'
 ;';
       $dates[$i]['elements'] = array();
@@ -485 +485 @@
   GROUP BY category_id
   ORDER BY img_count DESC
-  LIMIT 0 OFFSET '.$max_cats.'
+  LIMIT '.$max_cats.'
 ;';
       $dates[$i]['categories'] = array();

trunk/include/functions_tag.inc.php

@@ -240 +240 @@
     $query .= '
   ORDER BY counter DESC
-  LIMIT 0,'.$max_tags;
+  LIMIT '.$max_tags;
   }
   else

trunk/include/section_init.inc.php

@@ -491 +491 @@
     '.$forbidden.'
     '.$conf['order_by'].'
-  LIMIT 0, '.$conf['top_number'].'
+  LIMIT '.$conf['top_number'].'
 ;';
 
@@ -518 +518 @@
     '.$forbidden.'
     '.$conf['order_by'].'
-  LIMIT 0, '.$conf['top_number'].'
+  LIMIT '.$conf['top_number'].'
 ;';
     $page = array_merge(

trunk/include/ws_functions.inc.php

@@ -293 +293 @@
 GROUP BY i.id
 '.$order_by.'
-LIMIT '.(int)($params['per_page']*$params['page']).' OFFSET '.(int)$params['per_page'];
+LIMIT '.(int)$params['per_page'].' OFFSET '.(int)($params['per_page']*$params['page']);
 
     $result = pwg_query($query);
@@ -683 +683 @@
   WHERE '.$where_comments.'
   ORDER BY date
-  LIMIT '.(int)($params['comments_per_page']*$params['comments_page']).
-    ' OFFSET '.(int)$params['comments_per_page'];
+  LIMIT '.(int)$params['comments_per_page'].
+    ' OFFSET '.(int)($params['comments_per_page']*$params['comments_page']);
 
     $result = pwg_query($query);
@@ -1399 +1399 @@
     AND ', $where_clauses).'
 '.$order_by.'
-LIMIT '.(int)($params['per_page']*$params['page']).' OFFSET '.(int)$params['per_page'];
+LIMIT '.(int)$params['per_page'].' OFFSET '.(int)($params['per_page']*$params['page']);
 
     $result = pwg_query($query);