merge r7487 from branch 2.1 to trunk

bug 1973 fixed: aboid SQL syntax error if the category id given in the URL is
unknown.



git-svn-id: http://piwigo.org/svn/trunk@7488 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2010-10-29 22:34:41 +00:00
parent ef746f5df6
commit 7aae3dd985

View File

@@ -105,9 +105,15 @@ $page['where_clauses'] = array();
if (isset($_GET['cat']) and 0 != $_GET['cat'])
{
check_input_parameter('cat', $_GET, false, PATTERN_ID);
$category_ids = get_subcat_ids(array($_GET['cat']));
if (empty($category_id))
{
$category_ids = array(-1);
}
$page['where_clauses'][] =
'category_id IN ('.implode(',', get_subcat_ids(array($_GET['cat']))).')';
'category_id IN ('.implode(',', $category_ids).')';
}
// search a particular author