- added missing get_sql_condition_FandF in calendar

- cat list removed closing element tags never opened
- removed php warning from web service (cant get the result)

git-svn-id: http://piwigo.org/svn/trunk@1759 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 10 insertions, 1 deletions

diff --git a/include/functions_calendar.inc.php b/include/functions_calendar.inc.php
index 0ee126f5e..402002733 100644
--- a/include/functions_calendar.inc.php
+++ b/include/functions_calendar.inc.php
@@ -54,6 +54,15 @@ INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id = image_id';
       }
       $inner_sql .= '
 WHERE category_id IN ('.implode(',',$sub_ids).')';
+      $inner_sql .= '
+    '.get_sql_condition_FandF
+      (
+        array
+          (
+            'visible_images' => 'id'
+          ),
+        'AND', false
+      );
     }
     else
     {
@@ -64,7 +73,7 @@ WHERE category_id IN ('.implode(',',$sub_ids).')';
           (
             'forbidden_categories' => 'category_id',
             'visible_categories' => 'category_id',
-            'visible_images' => 'image_id'
+            'visible_images' => 'id'
           ),
         'WHERE', true
       );