merge r11481 from trunk
feature:2358 allow non-recursive mode for get_random_image_in_category git-svn-id: http://piwigo.org/svn/branches/2.2@11486 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
068554eaf7
commit
80b8e97ce8
1 changed files with 14 additions and 3 deletions
|
@ -501,7 +501,7 @@ function get_display_images_count($cat_nb_images, $cat_count_images, $cat_count_
|
||||||
*
|
*
|
||||||
* we need $category['uppercats'], $category['id'], $category['count_images']
|
* 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;
|
$image_id = null;
|
||||||
if ($category['count_images']>0)
|
if ($category['count_images']>0)
|
||||||
|
@ -510,8 +510,19 @@ function get_random_image_in_category($category)
|
||||||
SELECT image_id
|
SELECT image_id
|
||||||
FROM '.CATEGORIES_TABLE.' AS c
|
FROM '.CATEGORIES_TABLE.' AS c
|
||||||
INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.category_id = c.id
|
INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON ic.category_id = c.id
|
||||||
WHERE (c.id='.$category['id'].' OR uppercats LIKE \''.$category['uppercats'].',%\')'
|
WHERE ';
|
||||||
.get_sql_condition_FandF
|
if ($recursive)
|
||||||
|
{
|
||||||
|
$query.= '
|
||||||
|
(c.id='.$category['id'].' OR uppercats LIKE \''.$category['uppercats'].',%\')';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$query.= '
|
||||||
|
c.id='.$category['id'];
|
||||||
|
}
|
||||||
|
$query.= '
|
||||||
|
'.get_sql_condition_FandF
|
||||||
(
|
(
|
||||||
array
|
array
|
||||||
(
|
(
|
||||||
|
|
Loading…
Reference in a new issue