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

merge -r6870 from trunk

Browse source 
bug fix (recent some months): RSS and mail notifications could send the same thumbnail several times


git-svn-id: http://piwigo.org/svn/branches/2.1@6871 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2010-09-09 13:21:06 +00:00
parent 82eeaa70a0
commit e05f2b5e61
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/functions_notification.inc.php
View file

@ -496,7 +496,7 @@ SELECT date_available,
if ($max_elements>0) if ($max_elements>0)
{ // get some thumbnails ... { // get some thumbnails ...
$query = ' $query = '
SELECT id, path, name, tn_ext, file SELECT DISTINCT id, path, name, tn_ext, file
FROM '.IMAGES_TABLE.' i INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id=image_id FROM '.IMAGES_TABLE.' i INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id=image_id
'.$where_sql.' '.$where_sql.'
AND date_available=\''.$dates[$i]['date_available'].'\' AND date_available=\''.$dates[$i]['date_available'].'\'
@ -515,7 +515,7 @@ SELECT id, path, name, tn_ext, file
if ($max_cats>0) if ($max_cats>0)
{// get some categories ... {// get some categories ...
$query = ' $query = '
SELECT c.uppercats, COUNT(DISTINCT i.id) AS img_count SELECT DISTINCT c.uppercats, COUNT(DISTINCT i.id) AS img_count
FROM '.IMAGES_TABLE.' i INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON i.id=image_id FROM '.IMAGES_TABLE.' i INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON i.id=image_id
INNER JOIN '.CATEGORIES_TABLE.' c ON c.id=category_id INNER JOIN '.CATEGORIES_TABLE.' c ON c.id=category_id
'.$where_sql.' '.$where_sql.'
@ -635,4 +635,4 @@ if(!function_exists("strptime"))
return $res; return $res;
} }
} }
?> ?>