aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-10-29 22:34:41 +0000
committerplegall <plg@piwigo.org>2010-10-29 22:34:41 +0000
commit7aae3dd9853e0bbbecd2b7fc48acf3b0b96aa9e0 (patch)
tree93252d4d739e7e77dbd6228095fd0c9060f607e1
parentef746f5df6903b654d5fd93b0bfc68fe147c9e4a (diff)
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
Diffstat (limited to '')
-rw-r--r--comments.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/comments.php b/comments.php
index 0ffb05d97..78f3d011d 100644
--- a/comments.php
+++ b/comments.php
@@ -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