Changeset 11486

Timestamp:

Jun 22, 2011, 6:00:56 PM (13 years ago)

Author:

mistic100

Message:

merge r11481 from trunk
feature:2358 allow non-recursive mode for get_random_image_in_category

File:

• branches/2.2/include/functions_category.inc.php (modified) (2 diffs)

branches/2.2/include/functions_category.inc.php

@@ -502 +502 @@
  * we need $category['uppercats'], $category['id'], $category['count_images']
  */
-function get_random_image_in_category($category)
+function get_random_image_in_category($category, $recursive=true)
 {
   $image_id = null;
@@ -511 +511 @@
   FROM '.CATEGORIES_TABLE.' AS c
     INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.category_id = c.id
-  WHERE (c.id='.$category['id'].' OR uppercats LIKE \''.$category['uppercats'].',%\')'
-    .get_sql_condition_FandF
+  WHERE ';
+    if ($recursive)
+    {
+      $query.= '
+    (c.id='.$category['id'].' OR uppercats LIKE \''.$category['uppercats'].',%\')';
+    }
+    else
+    {
+      $query.= '
+    c.id='.$category['id'];
+    }
+    $query.= '
+    '.get_sql_condition_FandF
     (
       array