feature:2330 ability to hide the "new" icon for recent photos

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

3 files changed, 17 insertions, 8 deletions

diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php
index 4271ad9be..47ae8fda8 100644
--- a/include/category_cats.inc.php
+++ b/include/category_cats.inc.php
@@ -306,7 +306,6 @@ if (count($categories) > 0)
           'ID'    => $category['id'],
           'TN_SRC'   => $thumbnail_src_of[$category['representative_picture_id']],
           'TN_ALT'   => strip_tags($category['name']),
-          'icon_ts'  => get_icon($category['max_date_last'], $category['is_child_date_last']),
 
           'URL'   => make_index_url(
             array(
@@ -328,6 +327,10 @@ if (count($categories) > 0)
                 'subcatify_category_description')),
           'NAME'  => $name,
         );
+    if ($conf['index_new_icon'])
+    {
+      $row['icon_ts'] = get_icon($category['max_date_last'], $category['is_child_date_last']);
+    }
 
     if ($conf['display_fromto'])
     {
diff --git a/include/category_default.inc.php b/include/category_default.inc.php
index 589d50724..66c89f889 100644
--- a/include/category_default.inc.php
+++ b/include/category_default.inc.php
@@ -110,7 +110,6 @@ foreach ($pictures as $row)
       'TN_SRC'    => get_thumbnail_url($row),
       'TN_ALT'    => $row['file'],
       'TN_TITLE'  => get_thumbnail_title($row),
-      'icon_ts'   => get_icon($row['date_available']),
       'URL'       => $url,
 
    /* Fields for template-extension usage */
@@ -127,6 +126,10 @@ foreach ($pictures as $row)
       'FILE_HAS_HD' => ($row['has_high'] and $user['enabled_high']=='true') ?
                 true:false, /* lack of include/functions_picture.inc.php */
     );
+  if ($conf['index_new_icon'])
+  {
+    $row['icon_ts'] = get_icon($row['date_available']);
+  }
 
   if ($user['show_nb_hits'])
   {
diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php
index 44cefb0b5..067b7b798 100644
--- a/include/functions_category.inc.php
+++ b/include/functions_category.inc.php
@@ -50,7 +50,7 @@ function check_restrictions($category_id)
 
 function get_categories_menu()
 {
-  global $page, $user, $filter;
+  global $page, $user, $filter, $conf;
 
   $query = '
 SELECT ';
@@ -110,21 +110,24 @@ WHERE '.$where.'
           'render_category_name',
           $row['name'],
           'get_categories_menu'
-        ),
+          ),
         'TITLE' => get_display_images_count(
           $row['nb_images'],
           $row['count_images'],
           $row['count_categories'],
           false,
           ' / '
-        ),
+          ),
         'URL' => make_index_url(array('category' => $row)),
         'LEVEL' => substr_count($row['global_rank'], '.') + 1,
-        'icon_ts' => get_icon($row['max_date_last'], $child_date_last),
         'SELECTED' => $selected_category['id'] == $row['id'] ? true : false,
         'IS_UPPERCAT' => $selected_category['id_uppercat'] == $row['id'] ? true : false,
-      )
-    );
+        )
+      );
+    if ($conf['index_new_icon'])
+    {
+      $row['icon_ts'] = get_icon($row['max_date_last'], $child_date_last);
+    }
     array_push($cats, $row);
     if ($row['id']==@$page['category']['id']) //save the number of subcats for later optim
       $page['category']['count_categories'] = $row['count_categories'];