- 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

3 files changed, 11 insertions, 9 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
       );
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index 511bbe31f..f4e58cd37 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -158,13 +158,6 @@ function ws_std_image_sql_filter( $params, $tbl_name='' )
   {
     $clauses[] = $tbl_name.'tn_ext IS NOT NULL';
   }
-  // Squared picture to show to rvelices how to solve that kind of request
-  if ( $params['f_square_ratio'] )
-  {
-    $clauses[] = $tbl_name.'width/'.$tbl_name.'height BETWEEN '
-               . $params['f_square_ratio'] . ' AND '
-               . (2 - $params['f_square_ratio']) ;
-  }
   return $clauses;
 }
 
diff --git a/template/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
index b5317fdb3..94642f873 100644
--- a/template/yoga/admin/cat_list.tpl
+++ b/template/yoga/admin/cat_list.tpl
@@ -42,7 +42,7 @@
       <p>
       <strong><a href="{categories.category.U_CHILDREN}" title="{lang:manage sub-categories}">{categories.category.NAME}</a></strong>
       <!-- BEGIN virtual -->
-      <img src="{themeconf:icon_dir}/virt_category.png" class="button" alt="{lang:virtual_category}" /></a></li>
+      <img src="{themeconf:icon_dir}/virt_category.png" class="button" alt="{lang:virtual_category}" />
       <!-- END virtual -->
       </p>