1 files changed, 3 insertions, 5 deletions
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 1b075f70a..da3e5e31e 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -686,13 +686,11 @@ SELECT COUNT(DISTINCT(id)) AS nb_total_images
           $page['title'] .= $page['calendar_year'];
           $page['title'] .= ')';
         }
+        
+        $page['where'] = 'WHERE '.$conf['calendar_datefield'].' IS NOT NULL';
         if (isset($forbidden))
         {
-          $page['where'] = 'WHERE '.$forbidden;
-        }
-        else
-        {
-          $page['where'] = 'WHERE 1=1';
+          $page['where'].= ' AND '.$forbidden;
         }
       }