Feature_1255:

- bug fix : function pwg_db_get_recent_period_expression
- add extra fields for select based on "order by"

git-svn-id: http://piwigo.org/svn/trunk@4387 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou
2009-11-29 14:06:16 +00:00
parent c96097529e
commit ad796f152f
4 changed files with 24 additions and 27 deletions
+2 -8
View File
@@ -49,8 +49,7 @@ SELECT tag_id, COUNT(DISTINCT(it.image_id)) counter
'
WHERE'
).'
GROUP BY tag_id
ORDER BY NULL';
GROUP BY tag_id';
$tag_counters = simple_hash_from_query($query, 'tag_id', 'counter');
if ( empty($tag_counters) )
@@ -234,18 +233,13 @@ SELECT t.*, count(*) counter
AND tag_id NOT IN ('.implode(',', $excluded_tag_ids).')';
}
$query .='
GROUP BY tag_id';
GROUP BY tag_id, t.id, t.name, t.url_name';
if ($max_tags>0)
{
$query .= '
ORDER BY counter DESC
LIMIT '.$max_tags;
}
else
{
$query .= '
ORDER BY NULL';
}
$result = pwg_query($query);
$tags = array();