Feature Issue ID 0000601: Filter all public pages with only recent elements
Fix problem with 0 category on filtered result Big error on my last commit for $filter['visible_images'] git-svn-id: http://piwigo.org/svn/trunk@1685 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
39d974b250
commit
48879ca177
1 changed files with 6 additions and 10 deletions
|
@ -70,11 +70,9 @@ if ($filter['enabled'])
|
|||
// Need to compute dats
|
||||
$filter['check_key'] = get_filter_check_key();
|
||||
$filter['categories'] = get_computed_categories($user['id'], $user['forbidden_categories'], true, $user['recent_period']);
|
||||
if (count($filter['categories']) > 0)
|
||||
{
|
||||
$filter['visible_categories'] = implode(',', array_keys($filter['categories']));
|
||||
}
|
||||
else
|
||||
|
||||
$filter['visible_categories'] = implode(',', array_keys($filter['categories']));
|
||||
if (empty($filter['visible_categories']))
|
||||
{
|
||||
// Must be not empty
|
||||
$filter['visible_categories'] = -1;
|
||||
|
@ -95,11 +93,9 @@ WHERE ';
|
|||
date_available > SUBDATE(
|
||||
CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY)';
|
||||
|
||||
if (count($filter['visible_images']) > 0)
|
||||
{
|
||||
$filter['visible_images'] = implode(',', array_from_query($query, 'image_id'));
|
||||
}
|
||||
else
|
||||
$filter['visible_images'] = implode(',', array_from_query($query, 'image_id'));
|
||||
|
||||
if (empty($filter['visible_images']))
|
||||
{
|
||||
// Must be not empty
|
||||
$filter['visible_images'] = -1;
|
||||
|
|
Loading…
Add table
Reference in a new issue