archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r11481 from trunk

Browse source 
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:
mistic100 2011-06-22 16:00:56 +00:00
parent 068554eaf7
commit 80b8e97ce8
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/functions_category.inc.php
View file

@ -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']
*/
function get_random_image_in_category($category)
function get_random_image_in_category($category, $recursive=true)
{
$image_id = null;
if ($category['count_images']>0)
@ -510,8 +510,19 @@ function get_random_image_in_category($category)
SELECT image_id
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
(