Changeset 1145 for trunk/include/category_recent_cats.inc.php

Timestamp:

Apr 11, 2006, 5:55:51 AM (18 years ago)

Author:

rvelices

Message:

merge r1144 from branch-1_6 into trunk

File:

• trunk/include/category_recent_cats.inc.php (modified) (5 diffs)

trunk/include/category_recent_cats.inc.php

@@ -47 +47 @@
        , tn_ext
        , nb_images
+       , c.name AS cat_name
   FROM '.CATEGORIES_TABLE.' AS c
     INNER JOIN '.IMAGES_TABLE.' AS i ON i.id = c.representative_picture_id
@@ -68 +69 @@
       )
     );
-  
+
   // template thumbnail initialization
   if (mysql_num_rows($result) > 0)
   {
     $template->assign_block_vars('categories', array());
+  }
+
+  $comment = null;
+  if (isset($row['comment']))
+  {
+    $comment = strip_tags($row['comment'], '<a><br><p><b><i><small><strong>');
   }
 
@@ -85 +92 @@
         'ALT'   => $row['file'],
         'TITLE' => $lang['hint_category'],
-        
+
         'URL'  => make_index_url(
           array(
             'category' => $row['category_id'],
+            'cat_name' => $row['cat_name'],
             )
           ),
         'NAME' => get_cat_display_name_cache($row['uppercats'], null, false),
         'NB_IMAGES' => $row['nb_images'],
-        'DESCRIPTION' => @$row['comment'],
+        'DESCRIPTION' => $comment,
         )
       );
@@ -111 +119 @@
     $row_number = 0;
   }
-  
+
   $old_level_separator = $conf['level_separator'];
   $conf['level_separator'] = '<br />';
@@ -124 +132 @@
         'IMAGE_ALT'   => $row['file'],
         'IMAGE_TITLE' => $lang['hint_category'],
-        
+
         'U_IMG_LINK'  => make_index_url(
           array(
             'category' => $row['category_id'],
+            'cat_name' => $row['cat_name'],
             )
           ),